rev 3845 - trunk/packages/kdenetwork/debian/patches

Pierre Habouzit madcoder at costa.debian.org
Thu Jun 1 20:42:43 UTC 2006


Author: madcoder
Date: 2006-06-01 20:40:58 +0000 (Thu, 01 Jun 2006)
New Revision: 3845

Modified:
   trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
kdenetwork buildprep



Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff	2006-06-01 20:33:55 UTC (rev 3844)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff	2006-06-01 20:40:58 UTC (rev 3845)
@@ -28,7 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5970,30 +5958,15 @@
+@@ -5973,30 +5961,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6053,7 +6026,7 @@
+@@ -6056,7 +6029,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -73,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6103,7 +6076,7 @@
+@@ -6106,7 +6079,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6123,7 +6096,7 @@
+@@ -6126,7 +6099,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -91,7 +91,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6143,6 +6116,7 @@
+@@ -6146,6 +6119,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -99,7 +99,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -6162,15 +6136,17 @@
+@@ -6165,15 +6139,17 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -119,7 +119,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6211,11 +6187,56 @@
+@@ -6214,11 +6190,56 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -176,7 +176,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6288,15 +6309,15 @@
+@@ -6291,15 +6312,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -195,7 +195,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6465,14 +6486,13 @@
+@@ -6468,14 +6489,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6484,7 +6504,6 @@
+@@ -6487,7 +6507,6 @@
        esac
        ;;
      *64-bit*)
@@ -220,7 +220,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6518,6 +6537,22 @@
+@@ -6521,6 +6540,22 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -243,7 +243,7 @@
  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
  [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6549,7 +6584,7 @@
+@@ -6552,7 +6587,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -252,7 +252,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6559,8 +6594,10 @@
+@@ -6562,8 +6597,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
@@ -265,7 +265,7 @@
         $2=yes
       fi
     fi
-@@ -6586,11 +6623,16 @@
+@@ -6589,11 +6626,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +283,7 @@
       else
         $2=yes
       fi
-@@ -6614,7 +6656,7 @@
+@@ -6617,7 +6659,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -292,7 +292,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6643,20 +6685,70 @@
+@@ -6646,20 +6688,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -369,7 +369,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6673,7 +6765,7 @@
+@@ -6676,7 +6768,7 @@
  
  
  # _LT_AC_CHECK_DLFCN
@@ -378,7 +378,7 @@
  AC_DEFUN([_LT_AC_CHECK_DLFCN],
  [AC_CHECK_HEADERS(dlfcn.h)dnl
  ])# _LT_AC_CHECK_DLFCN
-@@ -6681,7 +6773,7 @@
+@@ -6684,7 +6776,7 @@
  
  # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
  #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +387,7 @@
  AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "$cross_compiling" = yes; then :
-@@ -6747,17 +6839,19 @@
+@@ -6750,17 +6842,19 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -409,7 +409,7 @@
      esac
    else :
      # compilation failed
-@@ -6769,7 +6863,7 @@
+@@ -6772,7 +6866,7 @@
  
  
  # AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +418,7 @@
  AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "x$enable_dlopen" != xyes; then
-@@ -6806,7 +6900,7 @@
+@@ -6809,7 +6903,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -427,7 +427,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6840,7 +6934,7 @@
+@@ -6843,7 +6937,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -436,7 +436,7 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6853,7 +6947,7 @@
+@@ -6856,7 +6950,7 @@
      ])
  
      if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +445,7 @@
        AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
      	  lt_cv_dlopen_self_static, [dnl
  	  _LT_AC_TRY_DLOPEN_SELF(
-@@ -6895,20 +6989,13 @@
+@@ -6898,20 +6992,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -467,7 +467,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6920,13 +7007,18 @@
+@@ -6923,13 +7010,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -490,7 +490,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6985,8 +7077,8 @@
+@@ -6988,8 +7080,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +501,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7043,7 +7135,7 @@
+@@ -7046,7 +7138,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -510,7 +510,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7056,7 +7148,7 @@
+@@ -7059,7 +7151,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -519,7 +519,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7066,7 +7158,20 @@
+@@ -7069,7 +7161,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +541,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7131,7 +7236,7 @@
+@@ -7134,7 +7239,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
    ;;
  
  beos*)
-@@ -7140,7 +7245,7 @@
+@@ -7143,7 +7248,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -559,7 +559,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7156,7 +7261,7 @@
+@@ -7159,7 +7264,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -568,7 +568,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7168,7 +7273,8 @@
+@@ -7171,7 +7276,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7198,7 +7304,7 @@
+@@ -7201,7 +7307,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
        ;;
      esac
      ;;
-@@ -7221,7 +7327,7 @@
+@@ -7224,7 +7330,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +596,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7244,20 +7350,17 @@
+@@ -7247,20 +7353,17 @@
    dynamic_linker=no
    ;;
  
@@ -628,7 +628,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7275,14 +7378,19 @@
+@@ -7278,14 +7381,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -650,7 +650,7 @@
    esac
    ;;
  
-@@ -7302,9 +7410,9 @@
+@@ -7305,9 +7413,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -662,7 +662,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7319,7 +7427,7 @@
+@@ -7322,7 +7430,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -671,7 +671,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7330,7 +7438,7 @@
+@@ -7333,7 +7441,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -680,7 +680,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7342,6 +7450,18 @@
+@@ -7345,6 +7453,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -699,7 +699,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -7385,29 +7505,26 @@
+@@ -7388,29 +7508,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -736,7 +736,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7417,6 +7534,18 @@
+@@ -7420,6 +7537,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -755,7 +755,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7426,7 +7555,7 @@
+@@ -7429,7 +7558,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -764,7 +764,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7454,8 +7583,13 @@
+@@ -7457,8 +7586,13 @@
  
  openbsd*)
    version_type=sunos
@@ -779,7 +779,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7475,7 +7609,7 @@
+@@ -7478,7 +7612,7 @@
  
  os2*)
    libname_spec='$name'
@@ -788,7 +788,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7493,13 +7627,6 @@
+@@ -7496,13 +7630,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -802,7 +802,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -7525,7 +7652,7 @@
+@@ -7528,7 +7655,7 @@
    need_version=yes
    ;;
  
@@ -811,7 +811,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7558,6 +7685,29 @@
+@@ -7561,6 +7688,29 @@
    fi
    ;;
  
@@ -841,7 +841,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7571,6 +7721,11 @@
+@@ -7574,6 +7724,11 @@
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
  ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
  
-@@ -7595,6 +7750,9 @@
+@@ -7598,6 +7753,9 @@
        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
      fi
    fi
@@ -863,7 +863,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -7621,7 +7779,9 @@
+@@ -7624,7 +7782,9 @@
  
        case $tagname in
        CXX)
@@ -874,7 +874,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7683,7 +7843,7 @@
+@@ -7686,7 +7846,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -883,7 +883,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7721,7 +7881,7 @@
+@@ -7724,7 +7884,7 @@
  
  # AC_DISABLE_SHARED
  # -----------------
@@ -892,7 +892,7 @@
  AC_DEFUN([AC_DISABLE_SHARED],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_ENABLE_SHARED(no)
-@@ -7857,7 +8017,7 @@
+@@ -7860,7 +8020,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -901,7 +901,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -7967,7 +8127,7 @@
+@@ -7970,7 +8130,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -910,7 +910,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7999,7 +8159,7 @@
+@@ -8002,7 +8162,7 @@
  AC_DEFUN([AC_PROG_LD_GNU],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -919,7 +919,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -8026,6 +8186,15 @@
+@@ -8029,6 +8189,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8059,44 +8228,36 @@
+@@ -8062,44 +8231,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -991,7 +991,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8112,7 +8273,7 @@
+@@ -8115,7 +8276,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +1000,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8128,43 +8289,27 @@
+@@ -8131,43 +8292,27 @@
    esac
    ;;
  
@@ -1057,7 +1057,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -8183,32 +8328,22 @@
+@@ -8186,32 +8331,22 @@
    ;;
  
  openbsd*)
@@ -1093,7 +1093,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8229,10 +8364,13 @@
+@@ -8232,10 +8367,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1108,7 +1108,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -8252,36 +8390,43 @@
+@@ -8255,36 +8393,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -1176,7 +1176,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi])
  NM="$lt_cv_path_NM"
-@@ -8313,13 +8458,13 @@
+@@ -8316,13 +8461,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8338,13 +8483,13 @@
+@@ -8341,13 +8486,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1218,7 @@
  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
  AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8382,10 +8527,21 @@
+@@ -8385,10 +8530,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8425,7 +8581,7 @@
+@@ -8428,7 +8584,7 @@
  
  
  # AC_LIBTOOL_RC
@@ -1250,7 +1250,7 @@
  # enable support for Windows resource files
  AC_DEFUN([AC_LIBTOOL_RC],
  [AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8458,36 +8614,9 @@
+@@ -8461,36 +8617,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1290,7 +1290,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -8501,9 +8630,9 @@
+@@ -8504,9 +8633,9 @@
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
  AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1302,7 @@
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
  
-@@ -8512,7 +8641,7 @@
+@@ -8515,7 +8644,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1311,7 +1311,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8521,48 +8650,11 @@
+@@ -8524,48 +8653,11 @@
    fi
    ;;
  
@@ -1362,7 +1362,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8587,7 +8679,7 @@
+@@ -8590,7 +8682,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1371,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8599,6 +8691,7 @@
+@@ -8602,6 +8694,7 @@
  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
  _LT_AC_TAGVAR(module_cmds, $1)=
  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8616,7 +8709,7 @@
+@@ -8619,7 +8712,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1388,7 +1388,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8626,11 +8719,15 @@
+@@ -8629,11 +8722,15 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -1405,7 +1405,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8641,18 +8738,18 @@
+@@ -8644,18 +8741,18 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -1427,7 +1427,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8670,8 +8767,8 @@
+@@ -8673,8 +8770,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -1438,7 +1438,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8697,7 +8794,7 @@
+@@ -8700,7 +8797,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -1447,7 +1447,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8727,8 +8824,23 @@
+@@ -8730,8 +8827,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1473,7 +1473,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8745,7 +8857,7 @@
+@@ -8748,7 +8860,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1482,7 +1482,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -8764,8 +8876,12 @@
+@@ -8767,8 +8879,12 @@
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
@@ -1495,7 +1495,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8774,15 +8890,16 @@
+@@ -8777,15 +8893,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1516,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -8791,13 +8908,12 @@
+@@ -8794,13 +8911,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1532,7 +1532,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8806,22 +8922,32 @@
+@@ -8809,22 +8925,32 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1576,7 @@
      esac
      ;;
  
-@@ -8829,12 +8955,12 @@
+@@ -8832,12 +8958,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1591,7 +1591,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8843,70 +8969,81 @@
+@@ -8846,70 +8972,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1725,7 +1725,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8917,14 +9054,14 @@
+@@ -8920,14 +9057,14 @@
  	;;
      esac
      ;;
@@ -1742,7 +1742,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8941,12 +9078,12 @@
+@@ -8944,12 +9081,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1758,7 +1758,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8955,11 +9092,11 @@
+@@ -8958,11 +9095,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -1772,7 +1772,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8969,34 +9106,23 @@
+@@ -8972,34 +9109,23 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1814,7 +1814,7 @@
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9006,17 +9132,20 @@
+@@ -9009,17 +9135,20 @@
      esac
  
      case $cc_basename in
@@ -1841,7 +1841,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -9032,12 +9161,15 @@
+@@ -9035,12 +9164,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -9048,11 +9180,25 @@
+@@ -9051,11 +9183,25 @@
  	;;
      esac
      ;;
@@ -1889,7 +1889,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9063,9 +9209,9 @@
+@@ -9066,9 +9212,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1901,7 +1901,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9074,16 +9220,16 @@
+@@ -9077,16 +9223,16 @@
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
@@ -1922,7 +1922,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9101,20 +9247,44 @@
+@@ -9104,20 +9250,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1973,7 +1973,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9142,7 +9312,7 @@
+@@ -9145,7 +9315,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1982,7 +1982,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9152,7 +9322,7 @@
+@@ -9155,7 +9325,7 @@
  	;;
      esac
      ;;
@@ -1991,7 +1991,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -9163,15 +9333,31 @@
+@@ -9166,15 +9336,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -2025,7 +2025,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9181,14 +9367,14 @@
+@@ -9184,14 +9370,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -2043,7 +2043,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9206,7 +9392,7 @@
+@@ -9209,7 +9395,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9225,13 +9411,13 @@
+@@ -9228,13 +9414,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -2068,7 +2068,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,17 +9426,17 @@
+@@ -9243,17 +9429,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -2090,7 +2090,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9269,7 +9455,7 @@
+@@ -9272,7 +9458,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9290,27 +9476,14 @@
+@@ -9293,27 +9479,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -2129,7 +2129,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9323,36 +9496,33 @@
+@@ -9326,36 +9499,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -2178,7 +2178,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9360,9 +9530,9 @@
+@@ -9363,9 +9533,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -2190,7 +2190,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9372,9 +9542,9 @@
+@@ -9375,9 +9545,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2202,7 +2202,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9383,9 +9553,9 @@
+@@ -9386,9 +9556,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -2214,7 +2214,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9398,12 +9568,63 @@
+@@ -9401,12 +9571,63 @@
  	;;
      esac
      ;;
@@ -2280,7 +2280,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9440,8 +9661,6 @@
+@@ -9443,8 +9664,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2289,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9459,7 +9678,7 @@
+@@ -9462,7 +9681,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2298,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -9513,7 +9732,7 @@
+@@ -9516,7 +9735,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -2307,7 +2307,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9553,7 +9772,7 @@
+@@ -9556,7 +9775,7 @@
         fi
         ;;
  
@@ -2316,7 +2316,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9589,13 +9808,37 @@
+@@ -9592,13 +9811,37 @@
  
  $rm -f confest.$objext
  
@@ -2355,7 +2355,7 @@
  # Ensure that the configuration vars for the C compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9639,12 +9882,16 @@
+@@ -9642,12 +9885,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2373,7 +2373,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9654,7 +9901,7 @@
+@@ -9657,7 +9904,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2382,7 +2382,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9662,8 +9909,10 @@
+@@ -9665,8 +9912,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2395,7 +2395,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9673,8 +9922,6 @@
+@@ -9676,8 +9925,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2404,7 +2404,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -9684,8 +9931,6 @@
+@@ -9687,8 +9934,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2413,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9714,20 +9959,27 @@
+@@ -9717,20 +9962,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2442,7 +2442,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -9739,8 +9991,6 @@
+@@ -9742,8 +9994,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2451,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9750,7 +10000,7 @@
+@@ -9753,7 +10003,7 @@
  
  
  # AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2460,7 @@
  # Ensure that the configuration vars for the Windows resource compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9774,11 +10024,16 @@
+@@ -9777,11 +10027,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2477,7 +2477,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9804,11 +10059,12 @@
+@@ -9807,11 +10062,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2492,7 +2492,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9858,7 +10114,7 @@
+@@ -9861,7 +10117,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2501,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9924,11 +10180,11 @@
+@@ -9927,11 +10183,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2515,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9959,6 +10215,12 @@
+@@ -9962,6 +10218,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2528,7 +2528,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9970,6 +10232,9 @@
+@@ -9973,6 +10235,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2538,7 +2538,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -9989,7 +10254,7 @@
+@@ -9992,7 +10257,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2547,7 +2547,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -10020,7 +10285,7 @@
+@@ -10023,7 +10288,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10035,7 +10300,7 @@
+@@ -10038,7 +10303,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2565,7 +2565,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10264,7 +10529,10 @@
+@@ -10267,7 +10532,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -2577,7 +2577,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10306,9 +10574,6 @@
+@@ -10309,9 +10577,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2587,7 +2587,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -10330,14 +10595,30 @@
+@@ -10333,14 +10598,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -2620,7 +2620,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10355,14 +10636,17 @@
+@@ -10358,14 +10639,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10518,6 +10802,10 @@
+@@ -10521,6 +10805,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2651,7 +2651,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10526,7 +10814,7 @@
+@@ -10529,7 +10817,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2660,7 +2660,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10551,18 +10839,28 @@
+@@ -10554,18 +10842,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2692,7 +2692,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10570,22 +10868,22 @@
+@@ -10573,22 +10871,22 @@
  	    ;;
  	esac
  	;;
@@ -2721,7 +2721,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10598,9 +10896,13 @@
+@@ -10601,9 +10899,13 @@
  	    ;;
  	esac
  	;;
@@ -2736,7 +2736,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -10609,20 +10911,26 @@
+@@ -10612,20 +10914,26 @@
  	    ;;
  	esac
  	;;
@@ -2768,7 +2768,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10639,25 +10947,25 @@
+@@ -10642,25 +10950,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2799,7 +2799,7 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10671,24 +10979,15 @@
+@@ -10674,24 +10982,15 @@
  	;;
        psos*)
  	;;
@@ -2826,7 +2826,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10698,12 +10997,12 @@
+@@ -10701,12 +11000,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2841,7 +2841,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10713,7 +11012,7 @@
+@@ -10716,7 +11015,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2850,7 +2850,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10721,7 +11020,14 @@
+@@ -10724,7 +11023,14 @@
  	    ;;
  	esac
  	;;
@@ -2866,7 +2866,7 @@
  	;;
        vxworks*)
  	;;
-@@ -10768,6 +11074,11 @@
+@@ -10771,6 +11077,11 @@
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
        ;;
  
@@ -2878,7 +2878,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -10784,7 +11095,7 @@
+@@ -10787,7 +11098,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2887,7 +2887,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10810,6 +11121,16 @@
+@@ -10813,6 +11124,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2904,7 +2904,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10821,7 +11142,7 @@
+@@ -10824,7 +11145,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2913,7 +2913,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10844,13 +11165,20 @@
+@@ -10847,13 +11168,20 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2936,7 +2936,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10865,15 +11193,15 @@
+@@ -10868,15 +11196,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2958,7 +2958,7 @@
        ;;
  
      sunos4*)
-@@ -10882,7 +11210,7 @@
+@@ -10885,7 +11213,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2967,7 +2967,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10895,6 +11223,17 @@
+@@ -10898,6 +11226,17 @@
        fi
        ;;
  
@@ -2985,7 +2985,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10922,7 +11261,7 @@
+@@ -10925,7 +11264,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2994,7 +2994,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10931,6 +11270,16 @@
+@@ -10934,6 +11273,16 @@
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -3011,7 +3011,7 @@
  ])
  
  
-@@ -10955,7 +11304,10 @@
+@@ -10958,7 +11307,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -3023,7 +3023,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10981,7 +11333,7 @@
+@@ -10984,7 +11336,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3032,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10998,7 +11350,8 @@
+@@ -11001,7 +11353,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11008,6 +11361,10 @@
+@@ -11011,6 +11364,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -3053,7 +3053,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -11018,6 +11375,27 @@
+@@ -11021,6 +11378,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -3081,7 +3081,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11055,7 +11433,7 @@
+@@ -11058,7 +11436,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -3090,7 +3090,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11065,13 +11443,13 @@
+@@ -11068,13 +11446,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3107,7 +3107,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11080,23 +11458,70 @@
+@@ -11083,23 +11461,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -3184,7 +3184,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<EOF 1>&2
-@@ -11110,13 +11535,40 @@
+@@ -11113,13 +11538,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3227,7 @@
      sunos4*)
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -11126,24 +11578,19 @@
+@@ -11129,24 +11581,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3259,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11155,7 +11602,7 @@
+@@ -11158,7 +11605,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3268,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11177,9 +11624,21 @@
+@@ -11180,9 +11627,21 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -3292,7 +3292,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11196,7 +11655,7 @@
+@@ -11199,7 +11658,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3301,7 +3301,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -11215,8 +11674,12 @@
+@@ -11218,8 +11677,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3314,7 +3314,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11224,30 +11687,30 @@
+@@ -11227,30 +11690,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3356,7 +3356,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11256,13 +11719,11 @@
+@@ -11259,13 +11722,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3373,7 @@
  	fi
        fi
        ;;
-@@ -11275,7 +11736,7 @@
+@@ -11278,7 +11739,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3382,7 +3382,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11285,69 +11746,69 @@
+@@ -11288,69 +11749,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
        ;;
  
      dgux*)
-@@ -11380,8 +11841,8 @@
+@@ -11383,8 +11844,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3509,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11850,7 @@
+@@ -11392,7 +11853,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -3518,7 +3518,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11403,47 +11864,62 @@
+@@ -11406,47 +11867,62 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        ;;
  
@@ -3605,7 +3605,7 @@
  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
-@@ -11457,7 +11933,7 @@
+@@ -11460,7 +11936,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -3614,7 +3614,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11467,7 +11943,7 @@
+@@ -11470,7 +11946,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -3623,7 +3623,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11490,7 +11966,8 @@
+@@ -11493,7 +11969,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3633,7 +3633,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11500,7 +11977,7 @@
+@@ -11503,7 +11980,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -3642,7 +3642,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11511,14 +11988,14 @@
+@@ -11514,14 +11991,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3659,7 +3659,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11530,13 +12007,13 @@
+@@ -11533,13 +12010,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3675,7 +3675,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11544,21 +12021,15 @@
+@@ -11547,21 +12024,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3701,7 +3701,7 @@
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11567,8 +12038,18 @@
+@@ -11570,8 +12041,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3722,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11577,7 +12058,7 @@
+@@ -11580,7 +12061,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -3731,7 +3731,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11625,36 +12106,45 @@
+@@ -11628,36 +12109,45 @@
        fi
        ;;
  
@@ -3798,7 +3798,7 @@
        ;;
  
      uts4*)
-@@ -11672,11 +12162,6 @@
+@@ -11675,11 +12165,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3810,7 +3810,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -11697,13 +12182,14 @@
+@@ -11700,13 +12185,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -11831,7 +12317,7 @@
+@@ -11834,7 +12320,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3835,48 +3835,691 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
+--- config.h.in
++++ config.h.in
+@@ -300,22 +300,22 @@
+ /* Define if third argument of scandir needs const */
+ #undef SCANDIR_NEEDS_CONST
  
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+ 
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+ 
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+ 
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+ 
+ /* Determine pointer size for SQLite */
+@@ -567,7 +567,7 @@
+    kde_socklen_t) */
+ #undef ksize_t
+ 
+-/* Define to `unsigned' if <sys/types.h> does not define. */
++/* Define to `unsigned int' if <sys/types.h> does not define. */
+ #undef size_t
+ 
+ /* Define to `unsigned int' if not defined. */
+--- configure
++++ configure
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.59d.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -16,11 +17,35 @@
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+ 
 +
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
 +
-+# serial 4
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
 +
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -29,8 +54,43 @@
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" ""	$as_nl"
 +
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
 +
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44,18 +104,19 @@
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
  
- # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
---- configure
-+++ configure
-@@ -278,15 +278,15 @@
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
  
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -63,157 +124,386 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
++# CDPATH.
++$as_unset CDPATH
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++  if (eval ":") 2>/dev/null; then
++  as_have_required=yes
++else
++  as_have_required=no
+ fi
+ 
++  if test $as_have_required = yes && 	 (eval ":
++(as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0) || { (exit 1); exit 1; }
++
++(
++  as_lineno_1=\$LINENO
++  as_lineno_2=\$LINENO
++  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++  :
++else
++  as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
++  case $as_dir in
+ 	 /*)
+-	   if ("$as_dir/$as_base" -c '
++	   for as_base in sh bash ksh sh5; do
++	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++	   done;;
++       esac
++done
++IFS=$as_save_IFS
++
++
++      for as_shell in $as_candidate_shells $SHELL; do
++	 # Try only shells which exist, to save several forks.
++	 if test -f "$as_shell" &&
++		{ ("$as_shell") 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++_ASEOF
++}; then
++  CONFIG_SHELL=$as_shell
++	       as_have_required=yes
++	       if { "$as_shell" 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++(as_func_return () {
++  (exit $1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++  break
++fi
++
++fi
++
++      done
++
++      if test "x$CONFIG_SHELL" != x; then
++  for as_var in BASH_ENV ENV
++        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++        done
++        export CONFIG_SHELL
++        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++    if test $as_have_required = no; then
++  echo This script requires a shell more modern than all the
++      echo shells that I found on your system.  Please install a
++      echo modern shell, or manually run the script under such a
++      echo shell if you do have one.
++      { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++  echo No shell found that supports shell functions.
++  echo Please tell autoconf at gnu.org about your system,
++  echo including any error possibly output before this
++  echo message
++}
++
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
++  chmod +x "$as_me.lineno" ||
+     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (dirname -- /) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -222,7 +512,19 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++  as_executable_p="test -x"
++else
++  as_executable_p=:
++fi
++rm -f conf$$.file
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,15 +533,6 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ 
+ 
+ # Check that we are running under the correct shell.
+@@ -278,15 +571,15 @@
+ 
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
 -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -3894,16 +4537,842 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -464,7 +464,7 @@
+@@ -395,29 +688,26 @@
+ 
+ tagnames=${tagnames+${tagnames},}F77
+ 
++exec 7<&0 </dev/null 6>&1
++
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+@@ -455,17 +745,376 @@
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
++#endif
++#if HAVE_STDINT_H
++# include <stdint.h>
+ #endif
+ #if HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM 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_vars='SHELL
++PATH_SEPARATOR
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++target
++target_cpu
++target_vendor
++target_os
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++CYGPATH_W
++PACKAGE
++VERSION
++ACLOCAL
++AUTOCONF
++AUTOMAKE
++AUTOHEADER
++MAKEINFO
++install_sh
++STRIP
++INSTALL_STRIP_PROGRAM
++mkdir_p
++AWK
++SET_MAKE
++am__leading_dot
++AMTAR
++am__tar
++am__untar
++MAINTAINER_MODE_TRUE
++MAINTAINER_MODE_FALSE
++MAINT
++KDECONFIG
++kde_libs_prefix
++kde_libs_htmldir
++CONF_FILES
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++DEPDIR
++am__include
++am__quote
++AMDEP_TRUE
++AMDEP_FALSE
++AMDEPBACKSLASH
++CCDEPMODE
++am__fastdepCC_TRUE
++am__fastdepCC_FALSE
++CPP
++CXX
++CXXFLAGS
++ac_ct_CXX
++CXXDEPMODE
++am__fastdepCXX_TRUE
++am__fastdepCXX_FALSE
++WOVERLOADED_VIRTUAL
++HAVE_GCC_VISIBILITY
++unsermake_enable_pch_TRUE
++unsermake_enable_pch_FALSE
++USE_EXCEPTIONS
++USE_RTTI
++CXXCPP
++NOOPT_CXXFLAGS
++NOOPT_CFLAGS
++ENABLE_PERMISSIVE_FLAG
++LDFLAGS_AS_NEEDED
++LDFLAGS_NEW_DTAGS
++KDE_USE_FINAL_TRUE
++KDE_USE_FINAL_FALSE
++KDE_USE_CLOSURE_TRUE
++KDE_USE_CLOSURE_FALSE
++KDE_NO_UNDEFINED
++KDE_USE_NMCHECK_TRUE
++KDE_USE_NMCHECK_FALSE
++GREP
++EGREP
++LN_S
++ECHO
++AR
++RANLIB
++F77
++FFLAGS
++ac_ct_F77
++LIBTOOL
++KDE_PLUGIN
++KDE_CHECK_PLUGIN
++MSGFMT
++GMSGFMT
++XGETTEXT
++LIBUTIL
++LIBCOMPAT
++LIBCRYPT
++LIBRESOLV
++LIB_POLL
++FRAMEWORK_COREAUDIO
++LIBSOCKET
++X_EXTRA_LIBS
++LIBUCB
++LIBDL
++KDE_USE_FPIE
++KDE_USE_PIE
++include_x11_TRUE
++include_x11_FALSE
++XMKMF
++X_PRE_LIBS
++LIB_X11
++LIB_XRENDER
++LIBSM
++X_INCLUDES
++X_LDFLAGS
++x_includes
++x_libraries
++QTE_NORTTI
++LIB_XEXT
++LIBPTHREAD
++USE_THREADS
++KDE_MT_LDFLAGS
++KDE_MT_LIBS
++USER_INCLUDES
++USER_LDFLAGS
++LIBZ
++LIBPNG
++LIBJPEG
++qt_libraries
++qt_includes
++QT_INCLUDES
++QT_LDFLAGS
++PERL
++MOC
++UIC
++UIC_TR
++LIB_QT
++LIB_QPE
++kde_qtver
++KDE_EXTRA_RPATH
++KDE_RPATH
++X_RPATH
++kde_libraries
++kde_includes
++KDE_LDFLAGS
++KDE_INCLUDES
++all_includes
++all_libraries
++AUTODIRS
++include_ARTS_TRUE
++include_ARTS_FALSE
++MAKEKDEWIDGETS
++KCONFIG_COMPILER
++KCFG_DEPENDENCIES
++DCOPIDLNG
++DCOPIDL
++DCOPIDL2CPP
++DCOP_DEPENDENCIES
++MCOPIDL
++ARTSCCONFIG
++MEINPROC
++KDE_XSL_STYLESHEET
++XMLLINT
++kde_htmldir
++kde_appsdir
++kde_icondir
++kde_sounddir
++kde_datadir
++kde_locale
++kde_confdir
++kde_kcfgdir
++kde_mimedir
++kde_wallpaperdir
++kde_bindir
++xdg_appsdir
++xdg_menudir
++xdg_directorydir
++kde_templatesdir
++kde_servicesdir
++kde_servicetypesdir
++kde_moduledir
++kdeinitdir
++kde_styledir
++kde_widgetdir
++LIB_KDED
++LIB_KDECORE
++LIB_KDEUI
++LIB_KIO
++LIB_KJS
++LIB_SMB
++LIB_KAB
++LIB_KABC
++LIB_KHTML
++LIB_KSPELL
++LIB_KPARTS
++LIB_KDEPRINT
++LIB_KUTILS
++LIB_KDEPIM
++LIB_KIMPROXY
++LIB_KNEWSTUFF
++LIB_KDNSSD
++LIB_KUNITTEST
++LIB_KSYCOCA
++LIB_KFILE
++LIB_KFM
++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=''
++      ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++CPP
++CXX
++CXXFLAGS
++CCC
++CXXCPP
++F77
++FFLAGS
++XMKMF'
++
  
  # Initialize some variables set by options.
-@@ -1025,6 +1025,8 @@
+ ac_init_help=
+@@ -492,34 +1141,48 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+ 
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
++    eval $ac_prev=\$ac_option
+     ac_prev=
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case $ac_option in
++  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *)	ac_optarg=yes ;;
++  esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
++  case $ac_dashdash$ac_option in
++  --)
++    ac_dashdash=yes ;;
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+@@ -541,12 +1204,18 @@
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++  -datadir | --datadir | --datadi | --datad)
+     ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+-  | --da=*)
++  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -554,7 +1223,17 @@
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
++    eval enable_$ac_feature=no ;;
++
++  -docdir | --docdir | --docdi | --doc | --do)
++    ac_prev=docdir ;;
++  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++    docdir=$ac_optarg ;;
++
++  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++    ac_prev=dvidir ;;
++  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++    dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+@@ -563,11 +1242,7 @@
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -594,6 +1269,12 @@
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$ac_optarg ;;
+ 
++  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++    ac_prev=htmldir ;;
++  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++  | --ht=*)
++    htmldir=$ac_optarg ;;
++
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+@@ -618,13 +1299,16 @@
+   | --libexe=* | --libex=* | --libe=*)
+     libexecdir=$ac_optarg ;;
+ 
++  -localedir | --localedir | --localedi | --localed | --locale)
++    ac_prev=localedir ;;
++  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++    localedir=$ac_optarg ;;
++
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst \
+-  | --locals | --local | --loca | --loc | --lo)
++  | --localstate | --localstat | --localsta | --localst | --locals)
+     ac_prev=localstatedir ;;
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+     localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -689,6 +1373,16 @@
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+     program_transform_name=$ac_optarg ;;
+ 
++  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++    ac_prev=pdfdir ;;
++  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++    pdfdir=$ac_optarg ;;
++
++  -psdir | --psdir | --psdi | --psd | --ps)
++    ac_prev=psdir ;;
++  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++    psdir=$ac_optarg ;;
++
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+@@ -745,11 +1439,7 @@
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
++    eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+@@ -758,7 +1448,7 @@
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
++    eval with_$ac_package=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -789,8 +1479,7 @@
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
++    eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+@@ -810,27 +1499,19 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
+-  esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
++# Be sure to have absolute directory names.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
+-  eval ac_val=$`echo $ac_var`
++  eval ac_val=\$$ac_var
+   case $ac_val in
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++    [\\/$]* | ?:[\\/]* )  continue;;
++    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
++  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; }
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -857,94 +1538,76 @@
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++  { echo "$as_me: error: Working directory cannot be determined" >&2
++   { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++  { echo "$as_me: error: pwd does not report name of working directory" >&2
++   { (exit 1); exit 1; }; }
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
++  # Try the directory containing this script, then the parent directory.
++  ac_confdir=`$as_dirname -- "$0" ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$0" : 'X\(//\)[^/]' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   srcdir=$ac_confdir
+-  if test ! -r $srcdir/$ac_unique_file; then
++  if test ! -r "$srcdir/$ac_unique_file"; then
+     srcdir=..
+   fi
+ else
+   ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+-  if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+-   { (exit 1); exit 1; }; }
+-  else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+-   { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+-ac_env_CXX_set=${CXX+set}
+-ac_env_CXX_value=$CXX
+-ac_cv_env_CXX_set=${CXX+set}
+-ac_cv_env_CXX_value=$CXX
+-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_env_CXXFLAGS_value=$CXXFLAGS
+-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CXXCPP_set=${CXXCPP+set}
+-ac_env_CXXCPP_value=$CXXCPP
+-ac_cv_env_CXXCPP_set=${CXXCPP+set}
+-ac_cv_env_CXXCPP_value=$CXXCPP
+-ac_env_F77_set=${F77+set}
+-ac_env_F77_value=$F77
+-ac_cv_env_F77_set=${F77+set}
+-ac_cv_env_F77_value=$F77
+-ac_env_FFLAGS_set=${FFLAGS+set}
+-ac_env_FFLAGS_value=$FFLAGS
+-ac_cv_env_FFLAGS_set=${FFLAGS+set}
+-ac_cv_env_FFLAGS_value=$FFLAGS
++if test ! -r "$srcdir/$ac_unique_file"; then
++  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++   { (exit 1); exit 1; }; }
++	pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++  srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++  eval ac_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_env_${ac_var}_value=\$${ac_var}
++  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+ 
+ #
+ # Report the --help message.
+@@ -973,9 +1636,6 @@
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+-_ACEOF
+-
+-  cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+ 			  [$ac_default_prefix]
+@@ -993,15 +1653,22 @@
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
++  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR          info documentation [DATAROOTDIR/info]
++  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR           man documentation [DATAROOTDIR/man]
++  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
++  --htmldir=DIR          html documentation [DOCDIR]
++  --dvidir=DIR           dvi documentation [DOCDIR]
++  --pdfdir=DIR           pdf documentation [DOCDIR]
++  --psdir=DIR            ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -1025,6 +1692,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -3912,7 +5381,20 @@
    --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
-@@ -1064,8 +1066,8 @@
+@@ -1042,10 +1711,8 @@
+                           of memory)
+   --enable-closure        delay template instantiation
+   --enable-nmcheck        enable automatic namespace cleanness check
+-  --enable-shared[=PKGS]
+-                          build shared libraries [default=yes]
+-  --enable-static[=PKGS]
+-                          build static libraries [default=no]
++  --enable-shared[=PKGS]  build shared libraries [default=yes]
++  --enable-static[=PKGS]  build static libraries [default=no]
+   --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
+   --enable-fast-install[=PKGS]
+                           optimize for fast installation [default=yes]
+@@ -1064,8 +1731,8 @@
    --disable-slp     don't require libslp (Browsing in krfb and krdc not possible)
    --enable-smpppd         enable support for the SuSE Meta PPP Daemon (smpppd)
                            (default is NO)
@@ -3923,32 +5405,960 @@
    --disable-testbed     disable kopete testbed protocol compilation
  
  Optional Packages:
-@@ -1202,7 +1204,7 @@
+@@ -1074,8 +1741,7 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-pic              try to use only PIC/non-PIC objects [default=use
+                           both]
+-  --with-tags[=TAGS]
+-                          include additional configurations [automatic]
++  --with-tags[=TAGS]      include additional configurations [automatic]
+   --with-extra-includes=DIR
+                           adds non standard include paths
+   --with-extra-libs=DIR   adds non standard library paths
+@@ -1094,139 +1760,107 @@
+   --with-libidn=DIR       Support IDN (needs GNU Libidn)
+   --with-struct-callbacks use a callback structure instead of callback
+                           functions
+-  --with-wifi             enable support for wireless tools
+-                          [default=check]
++  --with-wifi             enable support for wireless tools [default=check]
+ 
+ Some influential environment variables:
+   CC          C compiler command
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+-              headers in a nonstandard directory <include dir>
++  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++              you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
+   CXXCPP      C++ preprocessor
+   F77         Fortran 77 compiler command
+   FFLAGS      Fortran 77 compiler flags
++  XMKMF       Path to xmkmf, Makefile generator for X Window System
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
+ _ACEOF
++ac_status=$?
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
++    test -d "$ac_dir" || continue
+     ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+-
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-	   test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++    cd "$ac_dir" || { ac_status=$?; continue; }
++    # Check for guested configure.
++    if test -f "$ac_srcdir/configure.gnu"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++    elif test -f "$ac_srcdir/configure"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure" --help=recursive
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
+-    fi
 -    cd $ac_popdir
-+    cd "$ac_popdir"
++    fi || ac_status=$?
++    cd "$ac_pwd" || { ac_status=$?; break; }
    done
  fi
  
-@@ -2105,6 +2107,31 @@
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.59d
  
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+-  exit 0
++  exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
  
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.59d.  Invocation command line was
  
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+   $ $0 $@
+ 
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1245,7 +1879,7 @@
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+@@ -1259,6 +1893,7 @@
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+ 
+ } >&5
+ 
+@@ -1291,7 +1926,7 @@
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++    *\'*)
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+@@ -1326,8 +1961,8 @@
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+@@ -1340,20 +1975,34 @@
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
+   (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       sed -n \
+-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
++	"s/'\''/'\''\\\\'\'''\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++      ;; #(
+     *)
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-}
++    esac |
++    sort
++)
+     echo
+ 
+     cat <<\_ASBOX
+@@ -1364,22 +2013,22 @@
+     echo
+     for ac_var in $ac_subst_vars
+     do
+-      eval ac_val=$`echo $ac_var`
+-      echo "$ac_var='"'"'$ac_val'"'"'"
++      eval ac_val=\$$ac_var
++      echo "$ac_var='\''$ac_val'\''"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+-	eval ac_val=$`echo $ac_var`
+-	echo "$ac_var='"'"'$ac_val'"'"'"
++	eval ac_val=\$$ac_var
++	echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1391,26 +2040,24 @@
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h | sort
++      cat confdefs.h
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -f core *.core &&
+-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++  rm -f core *.core core.conftest.* &&
++    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+-     ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
+ 
+ # Predefined preprocessor variables.
+ 
+@@ -1441,14 +2088,17 @@
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+-  if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
++if test -n "$CONFIG_SITE"; then
++  set x "$CONFIG_SITE"
++elif test "x$prefix" != xNONE; then
++  set x "$prefix/share/config.site" "$prefix/etc/config.site"
++else
++  set x "$ac_default_prefix/share/config.site" \
++	"$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in $CONFIG_SITE; do
++shift
++for ac_site_file
++do
+   if test -r "$ac_site_file"; then
+     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+@@ -1464,8 +2114,8 @@
+     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
++      [\\/]* | ?:[\\/]* ) . "$cache_file";;
++      *)                      . "./$cache_file";;
+     esac
+   fi
+ else
+@@ -1477,12 +2127,11 @@
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+-  eval ac_new_val="\$ac_env_${ac_var}_value"
++  eval ac_old_val=\$ac_cv_env_${ac_var}_value
++  eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+@@ -1507,8 +2156,7 @@
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+@@ -1525,12 +2173,6 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+ 
+ 
+ 
+@@ -1547,110 +2189,165 @@
+ 
+ 
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ ac_aux_dir=
+-for ac_dir in admin $srcdir/admin; do
+-  if test -f $ac_dir/install-sh; then
++for ac_dir in admin "$srcdir"/admin; do
++  if test -f "$ac_dir/install-sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
+-  elif test -f $ac_dir/install.sh; then
++  elif test -f "$ac_dir/install.sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+-  elif test -f $ac_dir/shtool; then
++  elif test -f "$ac_dir/shtool"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
++
+ 
+ 
+ unset CDPATH
+ 
+ # Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+-  ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
++  ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
+   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+-  ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++  if test "x$host_alias" = x; then
++  ac_cv_host=$ac_cv_build
++else
++  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
++fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+-  ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++  if test "x$target_alias" = x; then
++  ac_cv_target=$ac_cv_host
++else
++  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
++fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6; }
++case $ac_cv_target in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
++echo "$as_me: error: invalid value of canonical target" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_target
++shift
++target_cpu=$1
++target_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++target_os=$*
++IFS=$ac_save_IFS
++case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+ # The aliases save the names the user supplied, while $host etc.
+@@ -1660,17 +2357,17 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ test "$program_prefix" != NONE &&
+-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
++  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
++  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+ # Double any \ or $.  echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++rm -f conftest.sed
+ 
+ 
+ am__api_version="1.9"
+@@ -1692,8 +2389,8 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1715,7 +2412,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -1734,21 +2431,22 @@
+     ;;
+ esac
+ done
++IFS=$as_save_IFS
+ 
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+     INSTALL=$ac_cv_path_install
+   else
+-    # As a last resort, use the slow shell script.  We don't cache a
+-    # path for INSTALL within a source directory, because that will
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for INSTALL within a source directory, because that will
+     # break other packages using the cache if that directory is
+-    # removed, or if the path is relative.
++    # removed, or if the value is a relative name.
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1762,8 +2460,8 @@
+   if test -z "$kde_save_INSTALL_given" ; then
+     # OK, user hasn't given any INSTALL, autoconf found one for us
+     # now we test, if it supports the -p flag
+-    echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
++echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
+     rm -f confinst.$$.* > /dev/null 2>&1
+     echo "Testtest" > confinst.$$.orig
+     ac_res=no
+@@ -1775,8 +2473,8 @@
+       fi
+     fi
+     rm -f confinst.$$.*
+-    echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
++    { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+   fi
+ 
+   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
+@@ -1786,8 +2484,8 @@
+     INSTALL_SCRIPT='${INSTALL}'
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1829,8 +2527,8 @@
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+@@ -1881,8 +2579,8 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1895,41 +2593,44 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++  { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$AWK" && break
+ done
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+-	@echo 'ac_maketemp="$(MAKE)"'
++	@echo 'ac_maketemp=X"$(MAKE)"'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
++if test "$ac_maketemp" != X ; then
+   eval ac_cv_prog_make_${ac_make}_set=yes
+ else
+   eval ac_cv_prog_make_${ac_make}_set=no
+@@ -1937,12 +2638,12 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   SET_MAKE=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -2013,8 +2714,8 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2027,32 +2728,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++  { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2065,27 +2768,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -2105,6 +2822,31 @@
+ 
+ 
+ 
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++    # Check whether --enable-maintainer-mode was given.
 +if test "${enable_maintainer_mode+set}" = set; then
-+  enableval="$enable_maintainer_mode"
-+  USE_MAINTAINER_MODE=$enableval
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 +else
 +  USE_MAINTAINER_MODE=no
-+fi;
-+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
 +
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 +
++
 +if test $USE_MAINTAINER_MODE = yes; then
 +  MAINTAINER_MODE_TRUE=
 +  MAINTAINER_MODE_FALSE='#'
@@ -3964,347 +6374,3037 @@
  
    unset CDPATH
  
-@@ -3038,8 +3065,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
+@@ -2123,14 +2865,14 @@
+ 
+   if test "x$prefix" = "xNONE"; then
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2173,8 +2915,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2185,8 +2927,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2195,14 +2937,14 @@
+         kde_save_PATH="$PATH"
+     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2245,8 +2987,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2257,8 +2999,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2281,16 +3023,16 @@
+   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+   kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
+ 
+-  echo "$as_me:$LINENO: checking where to install" >&5
+-echo $ECHO_N "checking where to install... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking where to install" >&5
++echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
+   if test "x$prefix" = "xNONE"; then
+     prefix=$kde_libs_prefix
+-    echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
+-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
++    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
++echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
+   else
+         given_prefix=$prefix
+-    echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
+-echo "${ECHO_T}$prefix (as requested)" >&6
++    { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
++echo "${ECHO_T}$prefix (as requested)" >&6; }
+   fi
+ 
+   # And delete superfluous '/' to make compares easier
+@@ -2303,13 +3045,13 @@
+ 
+ 
+ 
+-    # Check whether --enable-fast-perl or --disable-fast-perl was given.
++    # Check whether --enable-fast-perl was given.
+ if test "${enable_fast_perl+set}" = set; then
+-  enableval="$enable_fast_perl"
+-  with_fast_perl=$enableval
++  enableval=$enable_fast_perl; with_fast_perl=$enableval
+ else
+   with_fast_perl=yes
+-fi;
++fi
++
+ 
+ 
+   val=
+@@ -2326,11 +3068,11 @@
+ 
+ 
+ 
+-          ac_config_headers="$ac_config_headers config.h"
++ac_config_headers="$ac_config_headers config.h"
+ 
+ DEPDIR="${am__leading_dot}deps"
+ 
+-          ac_config_commands="$ac_config_commands depfiles"
++ac_config_commands="$ac_config_commands depfiles"
+ 
+ 
+ am_make=${MAKE-make}
+@@ -2340,8 +3082,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2368,15 +3110,15 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+ 
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++# Check whether --enable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+-  enableval="$enable_dependency_tracking"
++  enableval=$enable_dependency_tracking;
++fi
+ 
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+@@ -2396,10 +3138,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-debug or --disable-debug was given.
++  # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+-  enableval="$enable_debug"
+-
++  enableval=$enable_debug;
+     case $enableval in
+       yes)
+         kde_use_debug_code="yes"
+@@ -2419,18 +3160,18 @@
+   kde_use_debug_code="no"
+       kde_use_debug_define=no
+ 
+-fi;
++fi
++
+ 
+-    # Check whether --enable-dummyoption or --disable-dummyoption was given.
++    # Check whether --enable-dummyoption was given.
+ if test "${enable_dummyoption+set}" = set; then
+-  enableval="$enable_dummyoption"
++  enableval=$enable_dummyoption;
++fi
+ 
+-fi;
+ 
+-  # Check whether --enable-strict or --disable-strict was given.
++  # Check whether --enable-strict was given.
+ if test "${enable_strict+set}" = set; then
+-  enableval="$enable_strict"
+-
++  enableval=$enable_strict;
+     if test $enableval = "no"; then
+          kde_use_strict_options="no"
+        else
+@@ -2439,12 +3180,12 @@
+ 
+ else
+   kde_use_strict_options="no"
+-fi;
++fi
+ 
+-  # Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+-  enableval="$enable_warnings"
+ 
++  # Check whether --enable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++  enableval=$enable_warnings;
+     if test $enableval = "no"; then
+          kde_use_warnings="no"
+        else
+@@ -2453,20 +3194,21 @@
+ 
+ else
+   kde_use_warnings="yes"
+-fi;
++fi
++
+ 
+     if test "$kde_use_debug_code" != "no"; then
+     kde_use_warnings=yes
+   fi
+ 
+-  # Check whether --enable-profile or --disable-profile was given.
++  # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then
+-  enableval="$enable_profile"
+-  kde_use_profiling=$enableval
++  enableval=$enable_profile; kde_use_profiling=$enableval
+ else
+   kde_use_profiling="no"
+ 
+-fi;
++fi
++
+ 
+     CFLAGS=" $CFLAGS"
+ 
+@@ -2478,8 +3220,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2492,32 +3234,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2530,36 +3274,51 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ else
+   CC="$ac_cv_prog_CC"
+ fi
+ 
+ if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2572,74 +3331,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+ 
++  fi
+ fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2653,7 +3372,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -2664,6 +3383,7 @@
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+   # We found a bogon in the path, so make sure we never use it.
+@@ -2681,22 +3401,23 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$CC"; then
+   if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2709,36 +3430,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+     test -n "$CC" && break
+   done
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2751,29 +3474,45 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CC" && break
+ done
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ fi
+ 
+ fi
+@@ -2786,25 +3525,38 @@
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
++echo "$as_me:$LINENO: checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
-@@ -3097,8 +3123,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -3214,8 +3239,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -3269,8 +3293,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+ 
++
++# List of possible output files.  We want to start from the most likely,
++# but we have to check foo.exe before foo, because Cygwin `test -f' looks
++# also for foo.exe.  b.out is created by i960 compilers.
++# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
++# But we are not allowed to rm a.*, and we do not want always remove
++# conftest.*, so we will list them literally, when appropriate.
++ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out"
++
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions.  Remove them first so a
++# subsequent execution test works.
++rm -f $ac_outfiles conftest.*
++
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -2820,51 +3572,40 @@
+   return 0;
+ }
+ _ACEOF
++
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files $ac_outfiles"
++
++# The following tests should remove their output except files matching conftest.*.
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
+ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
    ac_status=$?
-@@ -3315,8 +3338,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; then
+-  # Find the output, starting from the most likely.  This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++  for ac_file in $ac_outfiles a.* conftest.* NO
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+-	;;
+-    conftest.$ac_ext )
+-	# This is the source file.
+-	;;
+-    [ab].out )
+-	# We found the default executable, but exeext='' is most
+-	# certainly right.
+-	break;;
+-    *.* )
+-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	# FIXME: I believe we export ac_cv_exeext for Libtool,
+-	# but it would be cool to find out if it's true.  Does anybody
+-	# maintain Libtool? --akim.
+-	export ac_cv_exeext
+-	break;;
+-    * )
+-	break;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    * ) break;;
+   esac
+ done
++if test "$ac_file" = NO; then
++  { { echo "$as_me:$LINENO: error: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: no output file found
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2876,14 +3617,12 @@
+    { (exit 77); exit 77; }; }
+ fi
+ 
+-ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+-
+-# Check the compiler produces executables we can run.  If not, either
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++# Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+@@ -2908,83 +3647,84 @@
+     fi
+   fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
++# Clean up; list also $ac_file, in case it matched a wildcard entry.
++rm -f $ac_outfiles $ac_file
+ 
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++if test "${ac_cv_exeext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
    ac_status=$?
-@@ -3360,8 +3382,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; then
+-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  export ac_cv_exeext
+-	  break;;
+-    * ) break;;
+-  esac
+-done
++  # If both `conftest.exe' and `conftest' are `present' (well, observable),
++    # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++    # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
++    for ac_file in conftest.exe conftest conftest.* NO; do
++      test -f "$ac_file" || continue
++      case $ac_file in
++	*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++	*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	      break;;
++	* ) break;;
++      esac
++    done
++    if test "$ac_file" = NO; then
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++    # Clean up; list also $ac_file, in case it matched conftest.*.
++    rm -f $ac_outfiles $ac_file
++
+ else
+   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
++
+ fi
+ 
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+-rm -f conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++
++
++ac_clean_files=$ac_clean_files_save
++
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
++  rm -f conftest.o conftest.obj
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -3918,8 +3939,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; then
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  for ac_file in conftest.o conftest.obj conftest.*; do
++  test -f "$ac_file" || continue;
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+@@ -3000,14 +3740,16 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++
++
++rm -f conftest.*
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3056,24 +3798,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_save_c_werror_flag=$ac_c_werror_flag
++   ac_c_werror_flag=yes
++   ac_cv_prog_cc_g=no
++   CFLAGS="-g"
++   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3115,97 +3861,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++	CFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+-   function prototypes and stuff, but not '\xHH' hex character constants.
+-   These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std1 is added to get
+-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+-   array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std1.  */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+ 
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+ int
+ main ()
+ {
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++
+   ;
+   return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
++rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -3977,8 +3997,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
+@@ -3227,81 +3899,24 @@
    ac_status=$?
-@@ -4049,8 +4068,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=$?
-@@ -4094,8 +4112,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=$?
-@@ -4273,8 +4290,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
++  :
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
++	ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+@@ -3328,30 +3943,104 @@
    ac_status=$?
-@@ -4385,8 +4401,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; }; then
+-  :
++  ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-continue
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-exit (42);
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -4474,8 +4489,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
+@@ -3373,27 +4062,36 @@
    ac_status=$?
-@@ -4577,8 +4591,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; }; then
+-  break
++  ac_cv_prog_cc_c89=$ac_arg
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++  xno)
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++  *)
++    CC="$CC $ac_cv_prog_cc_c89"
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
+ 
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3402,8 +4100,8 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3492,8 +4190,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+ 
+@@ -3515,8 +4213,8 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -3576,9 +4274,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3616,6 +4315,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3633,8 +4333,8 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3683,9 +4383,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3723,6 +4424,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3773,18 +4475,22 @@
+ 
+   CXXFLAGS=" $CXXFLAGS"
+ 
+-  ac_ext=cc
++  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++if test -z "$CXX"; then
++  if test -n "$CCC"; then
++    CXX=$CCC
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3797,36 +4503,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
++  { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+     test -n "$CXX" && break
+   done
+ fi
+ if test -z "$CXX"; then
+   ac_ct_CXX=$CXX
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3839,55 +4547,70 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CXX" && break
+ done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+ 
+-  CXX=$ac_ct_CXX
++  if test "x$ac_ct_CXX" = x; then
++    CXX="g++"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CXX=$ac_ct_CXX
++  fi
+ fi
+ 
+-
++  fi
++fi
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C++ compiler version" >&5
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
-@@ -4677,8 +4690,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -4762,8 +4774,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -4852,8 +4863,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3936,24 +4659,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++   ac_cxx_werror_flag=yes
++   ac_cv_prog_cxx_g=no
++   CXXFLAGS="-g"
++   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3995,47 +4722,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+-  CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-g -O2"
+-  else
+-    CXXFLAGS="-g"
+-  fi
+-else
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-O2"
+-  else
+-    CXXFLAGS=
+-  fi
+-fi
+-for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
++	CXXFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+@@ -4067,20 +4765,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
++	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++	 CXXFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+@@ -4107,21 +4804,40 @@
    ac_status=$?
-@@ -4940,8 +4950,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=$?
-@@ -5028,8 +5037,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=$?
-@@ -5136,8 +5144,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=$?
-@@ -5230,8 +5237,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=$?
-@@ -5318,8 +5324,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=$?
-@@ -5406,8 +5411,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=$?
-@@ -5494,8 +5498,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=$?
-@@ -5610,8 +5613,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=$?
-@@ -5703,8 +5705,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=$?
-@@ -5792,8 +5793,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=$?
-@@ -5880,8 +5880,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=$?
-@@ -5968,8 +5967,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=$?
-@@ -6056,8 +6054,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=$?
-@@ -6144,8 +6141,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=$?
-@@ -6568,8 +6564,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=$?
-@@ -6695,8 +6690,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=$?
-@@ -6784,8 +6778,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=$?
-@@ -6868,185 +6861,6 @@
+   (exit $ac_status); }; }; then
+-  break
++  ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+ fi
+ 
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++  CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4130,8 +4846,8 @@
+ 
+ depcc="$CXX"  am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4220,8 +4936,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ 
+ 
+@@ -4239,8 +4955,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
++echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
+ 
+ 
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -4291,13 +5007,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_bad_compiler=yes
++	kde_bad_compiler=yes
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-  echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+-echo "${ECHO_T}$kde_bad_compiler" >&6
++  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
++echo "${ECHO_T}$kde_bad_compiler" >&6; }
+ 
+ if test "$kde_bad_compiler" = "yes"; then
+   { { echo "$as_me:$LINENO: error:
+@@ -4339,17 +5056,16 @@
+         fi
+       fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
+ kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+ 
+-
+-ac_ext=cc
++ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4403,7 +5119,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4417,29 +5135,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-fno-builtin $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
++echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
+ kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4492,7 +5209,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4506,13 +5225,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  WOVERLOADED_VRITUAL=""
+ fi
+@@ -4533,16 +5252,15 @@
+ 
+   if test "$kde_use_profiling" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
++echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
+ kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4595,7 +5313,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4609,16 +5329,16 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       CFLAGS="-pg $CFLAGS"
+       CXXFLAGS="-pg $CXXFLAGS"
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4633,16 +5353,15 @@
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4695,7 +5414,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4709,27 +5430,26 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4780,7 +5500,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CFLAGS="$save_CFLAGS"
+@@ -4794,13 +5516,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4808,16 +5530,15 @@
+           ;;
+         esac
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
++echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
+ kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4870,7 +5591,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4884,28 +5607,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wundef $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4958,7 +5680,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4972,28 +5696,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5046,7 +5769,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5060,13 +5785,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5078,13 +5803,13 @@
+     CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
+   fi
+ 
+-  # Check whether --enable-pch or --disable-pch was given.
++  # Check whether --enable-pch was given.
+ if test "${enable_pch+set}" = set; then
+-  enableval="$enable_pch"
+-   kde_use_pch=$enableval
++  enableval=$enable_pch;  kde_use_pch=$enableval
+ else
+    kde_use_pch=no
+-fi;
++fi
++
+ 
+   HAVE_GCC_VISIBILITY=0
+ 
+@@ -5092,16 +5817,15 @@
+   if test "$GXX" = "yes"; then
+     gcc_no_reorder_blocks=NO
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
+ kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5154,7 +5878,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5168,13 +5894,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  gcc_no_reorder_blocks=YES
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5186,16 +5912,15 @@
+           CFLAGS="$CFLAGS -fno-reorder-blocks"
+     fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5248,7 +5973,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5262,28 +5989,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
+ kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5336,7 +6062,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5350,28 +6078,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
+ kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5424,7 +6151,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5438,28 +6167,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5512,7 +6240,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5526,13 +6256,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_EXCEPTIONS="-fexceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  USE_EXCEPTIONS=
+ fi
+@@ -5540,37 +6270,37 @@
+     ENABLE_PERMISSIVE_FLAG="-fpermissive"
+ 
+     if test "$kde_use_pch" = "yes"; then
+-        echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
+         echo >conftest.h
+         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
+             kde_gcc_supports_pch=yes
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         else
+             kde_gcc_supports_pch=no
+-            echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++            { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         fi
+         if test "$kde_gcc_supports_pch" = "yes"; then
+-            echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
+             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
+                 kde_gcc_supports_pch=yes
+-                echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++                { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             else
+                 kde_gcc_supports_pch=no
+-                echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++                { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+             fi
+         fi
+         rm -f conftest.h conftest.h.gch
+     fi
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
++echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
+ if test "${kde_cv_opt_noinline_match+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5628,9 +6358,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_opt_noinline_match=no
++	kde_cv_opt_noinline_match=no
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -5638,8 +6369,8 @@
+   fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
++echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+ 
+     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5659,16 +6390,15 @@
+ 
+     if test "$kde_use_pch" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
++echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
+ kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5721,7 +6451,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5735,29 +6467,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --pch"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+                                               fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5810,7 +6541,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5824,28 +6557,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5898,7 +6630,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5912,28 +6646,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5986,7 +6719,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6000,28 +6735,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6074,7 +6808,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6088,28 +6824,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
++echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
+ kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6162,7 +6897,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6176,13 +6913,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --one_per"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -6289,13 +7026,13 @@
+ fi
+ 
+ 
+-  ac_ext=cc
++  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6351,9 +7088,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6391,6 +7129,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6408,8 +7147,8 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -6458,9 +7197,10 @@
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6498,6 +7238,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6524,16 +7265,15 @@
+      NOOPT_CFLAGS=-O0
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
++echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
+ kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6586,7 +7326,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6600,22 +7342,21 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  NOOPT_CXXFLAGS=-O0
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-  # Check whether --enable-coverage or --disable-coverage was given.
++  # Check whether --enable-coverage was given.
+ if test "${enable_coverage+set}" = set; then
+-  enableval="$enable_coverage"
+-
++  enableval=$enable_coverage;
+       if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
+         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
+         ac_coverage_linker="-lgcc"
+@@ -6631,36 +7372,36 @@
+       CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
+       LDFLAGS="$LDFLAGS $ac_coverage_linker"
+ 
+-fi;
++fi
++
+ 
+ 
+ 
+ 
+ 
+ 
+-  # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
++  # Check whether --enable-new_ldflags was given.
+ if test "${enable_new_ldflags+set}" = set; then
+-  enableval="$enable_new_ldflags"
+-  kde_use_new_ldflags=$enableval
++  enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
+ else
+   kde_use_new_ldflags=no
+-fi;
++fi
++
+ 
+   LDFLAGS_AS_NEEDED=""
+   LDFLAGS_NEW_DTAGS=""
+   if test "x$kde_use_new_ldflags" = "xyes"; then
+        LDFLAGS_NEW_DTAGS=""
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6713,7 +7454,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6727,29 +7470,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6802,7 +7544,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6816,13 +7560,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -6832,13 +7576,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-final or --disable-final was given.
++  # Check whether --enable-final was given.
+ if test "${enable_final+set}" = set; then
+-  enableval="$enable_final"
+-  kde_use_final=$enableval
++  enableval=$enable_final; kde_use_final=$enableval
+ else
+   kde_use_final=no
+-fi;
++fi
++
+ 
+   if test "x$kde_use_final" = "xyes"; then
+       KDE_USE_FINAL_TRUE=""
+@@ -6851,13 +7595,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-closure or --disable-closure was given.
++  # Check whether --enable-closure was given.
+ if test "${enable_closure+set}" = set; then
+-  enableval="$enable_closure"
+-  kde_use_closure=$enableval
++  enableval=$enable_closure; kde_use_closure=$enableval
+ else
+   kde_use_closure=no
+-fi;
++fi
++
+ 
+   KDE_NO_UNDEFINED=""
+   if test "x$kde_use_closure" = "xyes"; then
+@@ -6868,198 +7612,19 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -4490,7 +9590,125 @@
    fi
  
  
-@@ -7221,7 +7035,7 @@
+ 
+ 
+ 
+-  # Check whether --enable-nmcheck or --disable-nmcheck was given.
++  # Check whether --enable-nmcheck was given.
+ if test "${enable_nmcheck+set}" = set; then
+-  enableval="$enable_nmcheck"
+-  kde_use_nmcheck=$enableval
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
+   kde_use_nmcheck=no
+-fi;
++fi
++
+ 
+   if test "$kde_use_nmcheck" = "yes"; then
+       KDE_USE_NMCHECK_TRUE=""
+@@ -7074,10 +7639,9 @@
+ 
+ 
+ 
+-# Check whether --enable-shared or --disable-shared was given.
++# Check whether --enable-shared was given.
+ if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
++  enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+     no) enable_shared=no ;;
+@@ -7096,12 +7660,12 @@
+     esac
+ else
+   enable_shared=yes
+-fi;
++fi
+ 
+-# Check whether --enable-static or --disable-static was given.
++
++# Check whether --enable-static was given.
+ if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
++  enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+     no) enable_static=no ;;
+@@ -7120,7 +7684,8 @@
+     esac
+ else
+   enable_static=no
+-fi;
++fi
++
+ 
+ 
+ 
+@@ -7129,11 +7694,11 @@
+     if test -z "$kdelibsuff"; then
+        kdelibsuff="no"
+     fi
+-    # Check whether --enable-libsuffix or --disable-libsuffix was given.
++    # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
+-  enableval="$enable_libsuffix"
+-  kdelibsuff=$enableval
+-fi;
++  enableval=$enable_libsuffix; kdelibsuff=$enableval
++fi
++
+ 
+     if test "$kdelibsuff" = "auto"; then
+ 
+@@ -7154,8 +7719,8 @@
+        kdelibsuff=
+     fi
+     if test -z "$kdelibsuff"; then
+-        echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+-echo "${ECHO_T}not using lib directory suffix" >&6
++        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
++echo "${ECHO_T}not using lib directory suffix" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define KDELIBSUFF ""
+@@ -7171,14 +7736,13 @@
+ #define KDELIBSUFF "${kdelibsuff}"
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
++        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
++echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+     fi
+ 
+-# Check whether --enable-fast-install or --disable-fast-install was given.
++# Check whether --enable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
++  enableval=$enable_fast_install; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+     no) enable_fast_install=no ;;
+@@ -7197,10 +7761,11 @@
+     esac
+ else
+   enable_fast_install=yes
+-fi;
++fi
+ 
+-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++
++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ if test "${lt_cv_path_SED+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7224,7 +7789,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
@@ -4499,7 +9717,270 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7326,7 +7140,7 @@
+@@ -7253,57 +7818,204 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
++  ac_path_GREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in grep ggrep; do
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    # Check for GNU ac_path_GREP and select it if it is found.
++  # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++  ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    echo 'GREP' >> "conftest.nl"
++    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_GREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_GREP="$ac_path_GREP"
++      ac_path_GREP_max=$ac_count
+     fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++    $ac_path_GREP_found && break 3
++  done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
++else
++  ac_cv_path_GREP=$GREP
++fi
+ 
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
++
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  with_gnu_ld=no
+-fi;
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [\\/]* | ?:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_path_EGREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in egrep; do
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    # Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++  ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++    $ac_path_EGREP_found && break 3
++  done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++else
++  ac_cv_path_EGREP=$EGREP
++fi
++
++
++   fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi
++
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
+     ac_prog=ld
+     ;;
+   *)
+@@ -7312,11 +8024,11 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7329,7 +8041,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,
@@ -4508,7 +9989,27 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7360,7 +7174,7 @@
+@@ -7349,21 +8061,21 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++  { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -4517,7 +10018,33 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7390,6 +7204,15 @@
+@@ -7373,29 +8085,38 @@
+   ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4531,9 +10058,14 @@
 +    ;;
 +esac
  
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7400,36 +7223,43 @@
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7403,56 +8124,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -4601,7 +10133,37 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
-@@ -7476,44 +7306,36 @@
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+ 
+-echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
++  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+ 
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7479,44 +8207,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -4656,7 +10218,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7529,7 +7351,7 @@
+@@ -7532,7 +8252,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -4665,7 +10227,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7545,43 +7367,27 @@
+@@ -7548,43 +8268,27 @@
    esac
    ;;
  
@@ -4722,7 +10284,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7600,32 +7406,22 @@
+@@ -7603,32 +8307,22 @@
    ;;
  
  openbsd*)
@@ -4758,7 +10320,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7646,10 +7442,13 @@
+@@ -7649,17 +8343,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -4773,7 +10335,16 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -7665,6 +7464,9 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -7668,14 +8365,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -4783,16 +10354,27 @@
  # Allow CC to be a program name with arguments.
  compiler=$CC
  
-@@ -7699,7 +7501,7 @@
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++  enableval=$enable_libtool_lock;
++fi
+ 
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ # Some flags need to be propagated to the compiler or linker for good
+@@ -7702,7 +8402,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7702 "configure"' > conftest.$ac_ext
-+  echo '#line 7504 "configure"' > conftest.$ac_ext
+-  echo '#line 7705 "configure"' > conftest.$ac_ext
++  echo '#line 8405 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7742,14 +7544,13 @@
+@@ -7745,14 +8445,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -4809,7 +10391,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7761,7 +7562,6 @@
+@@ -7764,7 +8463,6 @@
        esac
        ;;
      *64-bit*)
@@ -4817,17 +10399,38 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7821,8 +7621,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=$?
-@@ -7857,6 +7656,26 @@
+@@ -7789,8 +8487,8 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7842,8 +8540,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-lt_cv_cc_needs_belf=no
++	lt_cv_cc_needs_belf=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+@@ -7853,13 +8552,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -4854,38 +10457,194 @@
  
  esac
  
-@@ -7897,8 +7716,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=$?
-@@ -8068,8 +7886,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=$?
-@@ -8136,8 +7953,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=$?
-@@ -8252,6 +8068,243 @@
+@@ -7867,8 +8586,8 @@
  
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7918,8 +8637,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
++	ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+@@ -7976,6 +8696,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -7995,8 +8716,8 @@
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -8019,12 +8740,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -8047,9 +8770,9 @@
+ 		  inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -8089,12 +8812,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Header=no"
++	eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -8109,18 +8834,19 @@
+ for ac_header in dlfcn.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8157,15 +8883,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8199,9 +8926,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -8225,25 +8953,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -8255,17 +8977,258 @@
+ 
  done
  
 +
@@ -4893,13 +10652,13 @@
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cc
++  ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4955,9 +10714,10 @@
 +  # Broken: fails on valid input.
 +continue
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
-+  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -4995,6 +10755,7 @@
 +ac_preproc_ok=:
 +break
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -5012,8 +10773,8 @@
 +else
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
-+echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
 +ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
@@ -5062,9 +10823,10 @@
 +  # Broken: fails on valid input.
 +continue
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
-+  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -5102,6 +10864,7 @@
 +ac_preproc_ok=:
 +break
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -5117,7 +10880,7 @@
 +   { (exit 1); exit 1; }; }
 +fi
 +
-+ac_ext=cc
++ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5128,45 +10891,219 @@
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8344,7 +8397,7 @@
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8278,36 +9241,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
  
+ fi
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+-  echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
++  { echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
  
++
+     test -n "$F77" && break
+   done
+ fi
+ if test -z "$F77"; then
+   ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8320,48 +9285,63 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_F77="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_F77" && break
+ done
+ 
+-  F77=$ac_ct_F77
++  if test "x$ac_ct_F77" = x; then
++    F77=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    F77=$ac_ct_F77
++  fi
+ fi
+ 
+ 
  # Provide some information about the compiler.
--echo "$as_me:8347:" \
-+echo "$as_me:8400:" \
-      "checking for Fortran 77 compiler version" >&5
+-echo "$as_me:8350:" \
+-     "checking for Fortran 77 compiler version" >&5
++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8390,8 +8443,7 @@
-   cat conftest.err >&5
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
+   ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -8440,8 +8492,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -8499,7 +8550,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+@@ -8371,8 +9351,8 @@
+ # input file.  (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
+@@ -8411,20 +9391,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8461,13 +9442,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_f77_g=no
++	ac_cv_prog_f77_g=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+ if test "$ac_test_FFLAGS" = set; then
+   FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8496,13 +9478,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ 
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
      i=0
 -  testring="ABCD"
 +  teststring="ABCD"
  
    case $build_os in
    msdosdjgpp*)
-@@ -8528,20 +8579,70 @@
+@@ -8531,20 +9513,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -5243,7 +11180,33 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -8578,9 +8679,6 @@
+@@ -8555,19 +9587,19 @@
+ fi
+ 
+ if test -n $lt_cv_sys_max_cmd_len ; then
+-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
++  { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+ 
+ 
+ 
+ 
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8581,9 +9613,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -5253,7 +11216,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -8602,14 +8700,30 @@
+@@ -8605,14 +9634,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -5286,7 +11249,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8627,14 +8741,17 @@
+@@ -8630,14 +9675,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -5306,8 +11269,41 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8796,7 +8913,7 @@
+@@ -8755,15 +9803,15 @@
+   lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+-  echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++  { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
++  { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
  
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${lt_cv_objdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8777,8 +9825,8 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+ 
+ 
+@@ -8799,7 +9847,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//'
@@ -5315,7 +11311,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8816,7 +8933,7 @@
+@@ -8819,7 +9867,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -5324,7 +11320,313 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9073,6 +9190,7 @@
+@@ -8829,8 +9877,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8843,32 +9891,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++  { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8881,27 +9931,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  AR=$ac_ct_AR
++  if test "x$ac_ct_AR" = x; then
++    AR="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    AR=$ac_ct_AR
++  fi
+ else
+   AR="$ac_cv_prog_AR"
+ fi
+@@ -8909,8 +9973,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8923,32 +9987,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++  { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8961,27 +10027,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  RANLIB=$ac_ct_RANLIB
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    RANLIB=$ac_ct_RANLIB
++  fi
+ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -8989,8 +10069,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9003,32 +10083,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++  { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9041,27 +10123,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -9076,6 +10172,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -5332,7 +11634,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9092,15 +9210,26 @@
+@@ -9095,21 +10192,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -5361,7 +11663,15 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -9126,7 +9255,7 @@
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9129,7 +10237,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -5370,7 +11680,31 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9188,7 +9317,7 @@
+@@ -9161,17 +10269,17 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+-    echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9191,7 +10299,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -5379,7 +11713,52 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9283,68 +9412,25 @@
+@@ -9223,11 +10331,11 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+   else
+@@ -9242,21 +10350,21 @@
+ enable_dlopen=yes
+ enable_win32_dll=no
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++  enableval=$enable_libtool_lock;
++fi
+ 
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ 
+-# Check whether --with-pic or --without-pic was given.
++# Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
++  withval=$with_pic; pic_mode="$withval"
+ else
+   pic_mode=default
+-fi;
++fi
++
+ test -z "$pic_mode" && pic_mode=default
+ 
+ # Use C for the default configuration in the libtool script
+@@ -9286,68 +10394,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -5463,7 +11842,18 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9373,18 +9459,20 @@
+@@ -9361,8 +10426,8 @@
+   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ 
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9376,26 +10441,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -5471,13 +11861,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9379: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9465: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9382: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10447: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9383: \$? = $ac_status" >&5
-+   echo "$as_me:9469: \$? = $ac_status" >&5
+-   echo "$as_me:9386: \$? = $ac_status" >&5
++   echo "$as_me:10451: \$? = $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
@@ -5489,7 +11879,28 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -9445,6 +9533,11 @@
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+@@ -9409,8 +10476,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl='-Wl,'
+@@ -9448,6 +10515,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -5501,7 +11912,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9461,7 +9554,7 @@
+@@ -9464,7 +10536,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -5510,7 +11921,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9487,6 +9580,16 @@
+@@ -9490,6 +10562,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -5527,7 +11938,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9498,7 +9601,7 @@
+@@ -9501,7 +10583,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.
@@ -5536,7 +11947,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9521,13 +9624,20 @@
+@@ -9524,13 +10606,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -5559,7 +11970,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9542,15 +9652,15 @@
+@@ -9545,15 +10634,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -5581,7 +11992,7 @@
        ;;
  
      sunos4*)
-@@ -9559,7 +9669,7 @@
+@@ -9562,7 +10651,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -5590,7 +12001,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9572,6 +9682,17 @@
+@@ -9575,6 +10664,17 @@
        fi
        ;;
  
@@ -5608,7 +12019,28 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9606,18 +9727,20 @@
+@@ -9586,16 +10686,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9609,26 +10709,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -5616,13 +12048,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9612: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9615: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10715: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9616: \$? = $ac_status" >&5
-+   echo "$as_me:9737: \$? = $ac_status" >&5
+-   echo "$as_me:9619: \$? = $ac_status" >&5
++   echo "$as_me:10719: \$? = $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
@@ -5634,28 +12066,58 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-@@ -9638,7 +9761,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+     case $lt_prog_compiler_pic in
+@@ -9641,7 +10743,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=
-@@ -9648,6 +9771,48 @@
+@@ -9651,72 +10753,112 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_cv_prog_compiler_c_o=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
 +  lt_prog_compiler_static_works=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -5679,8 +12141,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works" = xyes; then
 +    :
@@ -5689,23 +12151,21 @@
 +fi
 +
 +
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9660,38 +9825,36 @@
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
-    lt_compiler_flag="-o out/conftest2.$ac_objext"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
     # Note that $ac_compile itself does not contain backslashes and begins
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -5713,13 +12173,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9679: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9837: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9682: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10819: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9683: \$? = $ac_status" >&5
-+   echo "$as_me:9841: \$? = $ac_status" >&5
+-   echo "$as_me:9686: \$? = $ac_status" >&5
++   echo "$as_me:10823: \$? = $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
@@ -5743,7 +12203,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9762,6 +9925,16 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -9726,8 +10868,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   runpath_var=
+   allow_undefined_flag=
+@@ -9765,6 +10907,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -5760,7 +12259,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9772,6 +9945,10 @@
+@@ -9775,6 +10927,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -5771,7 +12270,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9782,6 +9959,27 @@
+@@ -9785,6 +10941,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -5799,7 +12298,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9819,7 +10017,7 @@
+@@ -9822,7 +10999,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -5808,7 +12307,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9829,13 +10027,13 @@
+@@ -9832,13 +11009,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'
@@ -5825,7 +12324,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
-@@ -9844,23 +10042,70 @@
+@@ -9847,23 +11024,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -5901,7 +12400,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9874,13 +10119,40 @@
+@@ -9877,13 +11101,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5944,7 +12443,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9890,24 +10162,19 @@
+@@ -9893,24 +11144,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5976,7 +12475,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9919,7 +10186,7 @@
+@@ -9922,7 +11168,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -5985,7 +12484,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9941,9 +10208,21 @@
+@@ -9944,9 +11190,21 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -6009,7 +12508,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9960,7 +10239,7 @@
+@@ -9963,7 +11221,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -6018,7 +12517,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9979,8 +10258,12 @@
+@@ -9982,8 +11240,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -6031,7 +12530,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9988,22 +10271,23 @@
+@@ -9991,22 +11253,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -6062,17 +12561,14 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10027,8 +10311,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=$?
-@@ -10055,14 +10338,13 @@
+@@ -10053,19 +11316,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -6090,17 +12586,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10089,8 +10371,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=$?
-@@ -10122,13 +10403,11 @@
+@@ -10115,7 +11379,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10125,13 +11391,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -6117,7 +12613,7 @@
  	fi
        fi
        ;;
-@@ -10141,7 +10420,7 @@
+@@ -10144,7 +11408,7 @@
        ld_shlibs=no
        ;;
  
@@ -6126,7 +12622,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10151,13 +10430,13 @@
+@@ -10154,13 +11418,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -6143,7 +12639,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -10167,52 +10446,52 @@
+@@ -10170,52 +11434,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -6236,7 +12732,7 @@
      fi
        ;;
  
-@@ -10246,8 +10525,8 @@
+@@ -10249,8 +11513,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6247,7 +12743,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10255,7 +10534,7 @@
+@@ -10258,7 +11522,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -6256,7 +12752,7 @@
        else
  	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -10269,47 +10548,62 @@
+@@ -10272,47 +11536,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -6343,7 +12839,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10323,7 +10617,7 @@
+@@ -10326,7 +11605,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -6352,7 +12848,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'
-@@ -10333,7 +10627,7 @@
+@@ -10336,7 +11615,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -6361,7 +12857,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10356,7 +10650,8 @@
+@@ -10359,7 +11638,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
@@ -6371,7 +12867,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10366,7 +10661,7 @@
+@@ -10369,7 +11649,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -6380,7 +12876,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10377,14 +10672,14 @@
+@@ -10380,14 +11660,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -6397,7 +12893,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'
-@@ -10396,13 +10691,13 @@
+@@ -10399,13 +11679,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6413,7 +12909,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10410,21 +10705,15 @@
+@@ -10413,21 +11693,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -6439,7 +12935,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10433,8 +10722,18 @@
+@@ -10436,8 +11710,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6460,7 +12956,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10443,7 +10742,7 @@
+@@ -10446,7 +11730,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.
@@ -6469,7 +12965,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10491,36 +10790,45 @@
+@@ -10494,36 +11778,45 @@
        fi
        ;;
  
@@ -6536,8 +13032,14 @@
        ;;
  
      uts4*)
-@@ -10539,11 +10847,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
+@@ -10538,15 +11831,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -6548,7 +13050,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10576,6 +10879,7 @@
+@@ -10564,8 +11852,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -10579,6 +11867,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -6556,7 +13069,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10611,7 +10915,7 @@
+@@ -10601,20 +11890,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -6565,7 +13095,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10621,7 +10925,20 @@
+@@ -10624,7 +11913,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6587,7 +13117,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10686,7 +11003,7 @@
+@@ -10689,7 +11991,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6596,7 +13126,7 @@
    ;;
  
  beos*)
-@@ -10695,7 +11012,7 @@
+@@ -10698,7 +12000,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -6605,7 +13135,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10711,7 +11028,7 @@
+@@ -10714,7 +12016,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -6614,7 +13144,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10723,7 +11040,8 @@
+@@ -10726,7 +12028,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -6624,7 +13154,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10753,7 +11071,7 @@
+@@ -10756,7 +12059,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6633,7 +13163,7 @@
        ;;
      esac
      ;;
-@@ -10776,7 +11094,7 @@
+@@ -10779,7 +12082,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -6642,7 +13172,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10799,20 +11117,17 @@
+@@ -10802,20 +12105,17 @@
    dynamic_linker=no
    ;;
  
@@ -6674,7 +13204,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10830,14 +11145,19 @@
+@@ -10833,14 +12133,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -6696,7 +13226,7 @@
    esac
    ;;
  
-@@ -10857,9 +11177,9 @@
+@@ -10860,9 +12165,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -6708,7 +13238,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10874,7 +11194,7 @@
+@@ -10877,7 +12182,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -6717,7 +13247,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10885,7 +11205,7 @@
+@@ -10888,7 +12193,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -6726,7 +13256,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10897,6 +11217,18 @@
+@@ -10900,6 +12205,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -6745,7 +13275,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10940,29 +11272,26 @@
+@@ -10943,29 +12260,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -6782,7 +13312,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10972,6 +11301,18 @@
+@@ -10975,6 +12289,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6801,7 +13331,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10981,7 +11322,7 @@
+@@ -10984,7 +12310,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -6810,7 +13340,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11009,8 +11350,13 @@
+@@ -11012,8 +12338,13 @@
  
  openbsd*)
    version_type=sunos
@@ -6825,7 +13355,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -11030,7 +11376,7 @@
+@@ -11033,7 +12364,7 @@
  
  os2*)
    libname_spec='$name'
@@ -6834,7 +13364,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11048,13 +11394,6 @@
+@@ -11051,13 +12382,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -6848,7 +13378,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11080,7 +11419,7 @@
+@@ -11083,7 +12407,7 @@
    need_version=yes
    ;;
  
@@ -6857,7 +13387,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11113,6 +11452,29 @@
+@@ -11116,6 +12440,29 @@
    fi
    ;;
  
@@ -6887,17 +13417,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11128,12 +11490,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -11127,16 +12474,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
 -   test -n "$runpath_var " || \
@@ -6907,77 +13445,428 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11259,8 +11626,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=$?
-@@ -11363,8 +11729,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=$?
-@@ -11429,8 +11794,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=$?
-@@ -11523,8 +11887,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=$?
-@@ -11589,8 +11952,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=$?
-@@ -11656,8 +12018,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=$?
-@@ -11723,8 +12084,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=$?
-@@ -11783,7 +12143,7 @@
+@@ -11156,8 +12508,8 @@
+   # directories.
+   hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+ 
+ if test "$hardcode_action" = relink; then
+   # Fast installation is not supported
+@@ -11170,29 +12522,29 @@
+ 
+ striplib=
+ old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++         { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+        else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+        ;;
+    *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ fi
+@@ -11224,8 +12576,8 @@
+ 
+   darwin*)
+   # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11238,17 +12590,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11280,14 +12632,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11301,8 +12654,8 @@
+    ;;
+ 
+   *)
+-    echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11329,30 +12682,24 @@
+ 
+ #undef shl_load
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_load ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
++#if defined __stub_shl_load || defined __stub___shl_load
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != shl_load;
++return shl_load ();
+   ;
+   return 0;
+ }
+@@ -11384,18 +12731,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_shl_load=no
++	ac_cv_func_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+   lt_cv_dlopen="shl_load"
+ else
+-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11408,17 +12756,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_load ();
+ int
+ main ()
+ {
+-shl_load ();
++return shl_load ();
+   ;
+   return 0;
+ }
+@@ -11450,19 +12798,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_shl_load=no
++	ac_cv_lib_dld_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11489,30 +12838,24 @@
+ 
+ #undef dlopen
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
++#if defined __stub_dlopen || defined __stub___dlopen
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != dlopen;
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11544,18 +12887,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_dlopen=no
++	ac_cv_func_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+ if test $ac_cv_func_dlopen = yes; then
+   lt_cv_dlopen="dlopen"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11568,17 +12912,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11610,19 +12954,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11635,17 +12980,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11677,19 +13022,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_svld_dlopen=no
++	ac_cv_lib_svld_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11702,17 +13048,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dld_link ();
+ int
+ main ()
+ {
+-dld_link ();
++return dld_link ();
+   ;
+   return 0;
+ }
+@@ -11744,14 +13090,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_dld_link=no
++	ac_cv_lib_dld_dld_link=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+@@ -11786,13 +13133,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -6986,16 +13875,24 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11799,7 +12159,7 @@
+ 
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11802,7 +13149,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11802 "configure"
-+#line 12162 "configure"
+-#line 11805 "configure"
++#line 13152 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11856,6 +12216,8 @@
+@@ -11859,6 +13206,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -7004,7 +13901,7 @@
  
      exit (status);
  }
-@@ -11865,12 +12227,12 @@
+@@ -11868,12 +13217,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7019,25 +13916,35 @@
      esac
    else :
      # compilation failed
-@@ -11885,7 +12247,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+@@ -11884,13 +13233,13 @@
  
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+ 
      if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
  if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11897,7 +12259,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11900,7 +13249,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11900 "configure"
-+#line 12262 "configure"
+-#line 11903 "configure"
++#line 13252 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11954,6 +12316,8 @@
+@@ -11957,6 +13306,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -7046,7 +13953,7 @@
  
      exit (status);
  }
-@@ -11963,12 +12327,12 @@
+@@ -11966,12 +13317,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7061,17 +13968,38 @@
      esac
    else :
      # compilation failed
-@@ -12001,7 +12365,7 @@
+@@ -11982,8 +13333,8 @@
+ 
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+     fi
  
+     CPPFLAGS="$save_CPPFLAGS"
+@@ -12004,19 +13355,19 @@
+ fi
  
+ 
 -# Report which librarie types wil actually be built
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
 +# Report which library types will actually be built
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -12013,7 +12377,7 @@
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
  
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -7079,7 +14007,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12022,47 +12386,10 @@
+@@ -12025,58 +13376,21 @@
    fi
    ;;
  
@@ -7127,8 +14055,25 @@
 -  fi
      ;;
  esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12088,7 +12415,8 @@
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+ 
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+ 
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12091,7 +13405,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.
@@ -7138,7 +14083,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 \
-@@ -12202,11 +12530,11 @@
+@@ -12205,11 +13520,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -7152,7 +14097,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12236,6 +12564,12 @@
+@@ -12239,6 +13554,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -7165,7 +14110,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12247,6 +12581,9 @@
+@@ -12250,6 +13571,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -7175,7 +14120,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12266,7 +12603,7 @@
+@@ -12269,7 +13593,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7184,7 +14129,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12297,7 +12634,7 @@
+@@ -12300,7 +13624,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7193,7 +14138,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12312,7 +12649,7 @@
+@@ -12315,7 +13639,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -7202,7 +14147,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12539,7 +12876,10 @@
+@@ -12542,7 +13866,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.
@@ -7214,7 +14159,23 @@
  fi
  
  
-@@ -12574,6 +12914,9 @@
+@@ -12555,11 +13882,11 @@
+ CC="$lt_save_CC"
+ 
+ 
+-# Check whether --with-tags or --without-tags was given.
++# Check whether --with-tags was given.
+ if test "${with_tags+set}" = set; then
+-  withval="$with_tags"
+-  tagnames="$withval"
+-fi;
++  withval=$with_tags; tagnames="$withval"
++fi
++
+ 
+ if test -f "$ltmain" && test -n "$tagnames"; then
+   if test ! -f "${ofile}"; then
+@@ -12577,6 +13904,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -7224,18 +14185,20 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12604,7 +12947,9 @@
+@@ -12607,8 +13937,10 @@
  
        case $tagname in
        CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-	  ac_ext=cc
 +	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
++	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12624,6 +12969,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -12627,6 +13959,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -7243,7 +14206,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12641,7 +12987,7 @@
+@@ -12644,7 +13977,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -7252,7 +14215,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12651,17 +12997,34 @@
+@@ -12654,17 +13987,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -7288,7 +14251,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12672,18 +13035,27 @@
+@@ -12675,18 +14025,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -7319,7 +14282,48 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12754,7 +13126,7 @@
+@@ -12700,18 +14059,18 @@
+   # Set up default GNU C++ configuration
+ 
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++# Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+   with_gnu_ld=no
+-fi;
++fi
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -12740,11 +14099,11 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12757,7 +14116,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,
@@ -7328,7 +14332,27 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -12788,7 +13160,7 @@
+@@ -12777,21 +14136,21 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++  { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -7337,7 +14361,18 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12807,8 +13179,8 @@
+@@ -12801,8 +14160,8 @@
+   ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+@@ -12810,8 +14169,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
@@ -7348,7 +14383,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12834,7 +13206,7 @@
+@@ -12837,7 +14196,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.
@@ -7357,7 +14392,18 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12865,8 +13237,23 @@
+@@ -12852,8 +14211,8 @@
+ fi
+ 
+ # PORTME: fill in a description of your system's C++ link characteristics
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+   aix3*)
+@@ -12868,8 +14227,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -7383,7 +14429,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12883,7 +13270,7 @@
+@@ -12886,7 +14260,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -7392,7 +14438,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12902,8 +13289,12 @@
+@@ -12905,8 +14279,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -7405,7 +14451,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12912,15 +13303,16 @@
+@@ -12915,15 +14293,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -7426,18 +14472,17 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -12950,8 +13342,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=$?
-@@ -12980,13 +13371,12 @@
+@@ -12976,20 +14355,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
@@ -7452,17 +14497,17 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13013,8 +13403,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=$?
-@@ -13046,16 +13435,26 @@
+@@ -13039,7 +14419,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13049,16 +14431,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -7494,7 +14539,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13069,12 +13468,12 @@
+@@ -13072,12 +14464,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
      # as there is no search path for DLLs.
      hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -7509,7 +14554,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
-@@ -13083,70 +13482,81 @@
+@@ -13086,70 +14478,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -7643,7 +14688,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13157,14 +13567,14 @@
+@@ -13160,14 +14563,14 @@
  	;;
      esac
      ;;
@@ -7660,7 +14705,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13181,12 +13591,12 @@
+@@ -13184,12 +14587,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -7676,7 +14721,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13195,11 +13605,11 @@
+@@ -13198,11 +14601,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.
@@ -7690,7 +14735,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13209,33 +13619,22 @@
+@@ -13212,33 +14615,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -7731,7 +14776,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13246,17 +13645,20 @@
+@@ -13249,17 +14641,20 @@
      esac
  
      case $cc_basename in
@@ -7758,7 +14803,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13272,12 +13674,15 @@
+@@ -13275,12 +14670,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -7778,7 +14823,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13288,11 +13693,25 @@
+@@ -13291,11 +14689,25 @@
  	;;
      esac
      ;;
@@ -7806,7 +14851,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13303,9 +13722,9 @@
+@@ -13306,9 +14718,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -7818,7 +14863,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13314,16 +13733,16 @@
+@@ -13317,16 +14729,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -7839,7 +14884,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13341,20 +13760,44 @@
+@@ -13344,20 +14756,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -7890,7 +14935,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13382,7 +13825,7 @@
+@@ -13385,7 +14821,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -7899,7 +14944,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13392,7 +13835,7 @@
+@@ -13395,7 +14831,7 @@
  	;;
      esac
      ;;
@@ -7908,7 +14953,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13403,15 +13846,31 @@
+@@ -13406,15 +14842,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::"'
      ;;
@@ -7942,7 +14987,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13421,14 +13880,14 @@
+@@ -13424,14 +14876,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -7960,7 +15005,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13446,7 +13905,7 @@
+@@ -13449,7 +14901,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7969,7 +15014,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13465,13 +13924,13 @@
+@@ -13468,13 +14920,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -7985,7 +15030,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13480,17 +13939,17 @@
+@@ -13483,17 +14935,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -8007,7 +15052,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13509,7 +13968,7 @@
+@@ -13512,7 +14964,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8016,7 +15061,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13530,27 +13989,14 @@
+@@ -13533,27 +14985,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -8046,7 +15091,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13563,36 +14009,33 @@
+@@ -13566,36 +15005,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -8095,7 +15140,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13600,9 +14043,9 @@
+@@ -13603,9 +15039,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -8107,7 +15152,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13612,9 +14055,9 @@
+@@ -13615,9 +15051,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
@@ -8119,7 +15164,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13623,9 +14066,9 @@
+@@ -13626,9 +15062,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -8131,7 +15176,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13638,12 +14081,63 @@
+@@ -13641,12 +15077,63 @@
  	;;
      esac
      ;;
@@ -8197,7 +15242,18 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13700,7 +14194,7 @@
+@@ -13666,8 +15153,8 @@
+     ld_shlibs_CXX=no
+     ;;
+ esac
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+ GCC_CXX="$GXX"
+@@ -13703,7 +15190,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.
@@ -8206,7 +15262,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13740,7 +14234,7 @@
+@@ -13743,7 +15230,7 @@
         fi
         ;;
  
@@ -8215,7 +15271,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13776,6 +14270,29 @@
+@@ -13779,6 +15266,29 @@
  
  $rm -f confest.$objext
  
@@ -8245,7 +15301,18 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13823,6 +14340,10 @@
+@@ -13787,8 +15297,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   # C++ specific cases for pic, static, wl, etc.
+   if test "$GXX" = yes; then
+@@ -13826,6 +15336,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -8256,7 +15323,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13831,7 +14352,7 @@
+@@ -13834,7 +15348,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -8265,7 +15332,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13856,18 +14377,28 @@
+@@ -13859,18 +15373,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -8297,7 +15364,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13875,22 +14406,22 @@
+@@ -13878,22 +15402,22 @@
  	    ;;
  	esac
  	;;
@@ -8326,7 +15393,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13903,9 +14434,13 @@
+@@ -13906,9 +15430,13 @@
  	    ;;
  	esac
  	;;
@@ -8341,7 +15408,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13914,20 +14449,26 @@
+@@ -13917,20 +15445,26 @@
  	    ;;
  	esac
  	;;
@@ -8372,7 +15439,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13944,25 +14485,25 @@
+@@ -13947,25 +15481,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -8403,7 +15470,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13976,24 +14517,15 @@
+@@ -13979,24 +15513,15 @@
  	;;
        psos*)
  	;;
@@ -8430,7 +15497,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -14003,12 +14535,12 @@
+@@ -14006,12 +15531,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -8445,7 +15512,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14018,7 +14550,7 @@
+@@ -14021,7 +15546,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -8454,7 +15521,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14026,7 +14558,14 @@
+@@ -14029,7 +15554,14 @@
  	    ;;
  	esac
  	;;
@@ -8470,7 +15537,28 @@
  	;;
        vxworks*)
  	;;
-@@ -14059,18 +14598,20 @@
+@@ -14039,16 +15571,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14062,26 +15594,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -8478,13 +15566,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14065: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14604: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14068: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15600: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14069: \$? = $ac_status" >&5
-+   echo "$as_me:14608: \$? = $ac_status" >&5
+-   echo "$as_me:14072: \$? = $ac_status" >&5
++   echo "$as_me:15604: \$? = $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
@@ -8496,50 +15584,40 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-@@ -14091,7 +14632,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+     case $lt_prog_compiler_pic_CXX in
+@@ -14094,7 +15628,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=
-@@ -14101,50 +14642,90 @@
+@@ -14104,8 +15638,50 @@
      ;;
  esac
  
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_cv_prog_compiler_c_o_CXX=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  lt_prog_compiler_static_works_CXX=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -8563,8 +15641,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
 +    :
@@ -8573,35 +15651,39 @@
 +fi
 +
 +
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14116,60 +15692,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
     lt_compile=`echo "$ac_compile" | $SED \
 -   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14132: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14708: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14135: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15704: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14136: \$? = $ac_status" >&5
-+   echo "$as_me:14712: \$? = $ac_status" >&5
+-   echo "$as_me:14139: \$? = $ac_status" >&5
++   echo "$as_me:15708: \$? = $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
@@ -8625,7 +15707,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14194,7 +14775,10 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -14179,8 +15753,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+@@ -14197,22 +15771,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -8637,8 +15758,13 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14205,11 +14789,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
+   ;;
+   esac
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8649,7 +15775,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14242,6 +14821,7 @@
+@@ -14230,8 +15802,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -14245,6 +15817,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -8657,7 +15794,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14277,7 +14857,7 @@
+@@ -14267,20 +15840,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -8666,7 +15820,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14287,7 +14867,20 @@
+@@ -14290,7 +15863,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8688,7 +15842,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14352,7 +14945,7 @@
+@@ -14355,7 +15941,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8697,7 +15851,7 @@
    ;;
  
  beos*)
-@@ -14361,7 +14954,7 @@
+@@ -14364,7 +15950,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -8706,7 +15860,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14377,7 +14970,7 @@
+@@ -14380,7 +15966,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -8715,7 +15869,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14389,7 +14982,8 @@
+@@ -14392,7 +15978,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -8725,7 +15879,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14419,7 +15013,7 @@
+@@ -14422,7 +16009,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8734,7 +15888,7 @@
        ;;
      esac
      ;;
-@@ -14442,7 +15036,7 @@
+@@ -14445,7 +16032,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -8743,7 +15897,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14465,20 +15059,17 @@
+@@ -14468,20 +16055,17 @@
    dynamic_linker=no
    ;;
  
@@ -8775,7 +15929,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14496,14 +15087,19 @@
+@@ -14499,14 +16083,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -8797,7 +15951,7 @@
    esac
    ;;
  
-@@ -14523,9 +15119,9 @@
+@@ -14526,9 +16115,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -8809,7 +15963,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14540,7 +15136,7 @@
+@@ -14543,7 +16132,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -8818,7 +15972,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14551,7 +15147,7 @@
+@@ -14554,7 +16143,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -8827,7 +15981,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14563,6 +15159,18 @@
+@@ -14566,6 +16155,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -8846,7 +16000,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14606,29 +15214,26 @@
+@@ -14609,29 +16210,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -8883,7 +16037,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14638,6 +15243,18 @@
+@@ -14641,6 +16239,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8902,7 +16056,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14647,7 +15264,7 @@
+@@ -14650,7 +16260,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -8911,7 +16065,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14675,8 +15292,13 @@
+@@ -14678,8 +16288,13 @@
  
  openbsd*)
    version_type=sunos
@@ -8926,7 +16080,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14696,7 +15318,7 @@
+@@ -14699,7 +16314,7 @@
  
  os2*)
    libname_spec='$name'
@@ -8935,7 +16089,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14714,13 +15336,6 @@
+@@ -14717,13 +16332,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -8949,7 +16103,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14746,7 +15361,7 @@
+@@ -14749,7 +16357,7 @@
    need_version=yes
    ;;
  
@@ -8958,7 +16112,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14779,6 +15394,29 @@
+@@ -14782,6 +16390,29 @@
    fi
    ;;
  
@@ -8988,17 +16142,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14794,12 +15432,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -14793,16 +16424,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
 -   test -n "$runpath_var CXX" || \
@@ -9008,7 +16170,18 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14831,1118 +15474,293 @@
+@@ -14822,8 +16458,8 @@
+   # directories.
+   hardcode_action_CXX=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-echo "${ECHO_T}$hardcode_action_CXX" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+ 
+ if test "$hardcode_action_CXX" = relink; then
+   # Fast installation is not supported
+@@ -14834,1152 +16470,327 @@
    enable_fast_install=needless
  fi
  
@@ -9442,26 +16615,28 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
--
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
- 
--#undef dlopen
 +# A BSD-compatible nm program.
 +NM=$lt_NM
  
+-#undef dlopen
++# A symbol stripping program
++STRIP=$lt_STRIP
+ 
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -9481,8 +16656,8 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
 -int
 -main ()
@@ -9518,8 +16693,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
 -ac_cv_func_dlopen=no
 -fi
@@ -9544,8 +16719,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9588,8 +16763,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# Used on cygwin: assembler.
++AS="$AS"
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -9615,8 +16790,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used on cygwin: assembler.
-+AS="$AS"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9659,8 +16834,9 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
 -ac_cv_lib_svld_dlopen=no
 -fi
@@ -9686,9 +16862,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9731,8 +16906,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
++# Object file suffix (normally "o").
++objext="$ac_objext"
  
 -ac_cv_lib_dld_dld_link=no
 -fi
@@ -9745,74 +16920,74 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
- 
 +# Old archive suffix (normally "a").
 +libext="$libext"
  
--fi
 +# Shared library suffix (normally ".so").
 +shrext_cmds='$shrext_cmds'
  
+-fi
 +# Executable file suffix (normally "").
 +exeext="$exeext"
  
--fi
 +# Additional compiler flags for building library objects.
 +pic_flag=$lt_lt_prog_compiler_pic_CXX
 +pic_mode=$pic_mode
  
+-fi
 +# What is the maximum length of a command?
 +max_cmd_len=$lt_cv_sys_max_cmd_len
  
--fi
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
+-fi
 +# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
  
--fi
 +# Do we need the lib prefix for modules?
 +need_lib_prefix=$need_lib_prefix
  
+-fi
 +# Do we need a version for libraries?
 +need_version=$need_version
  
--fi
 +# Whether dlopen is supported.
 +dlopen_support=$enable_dlopen
  
--    ;;
--  esac
+-fi
 +# Whether dlopen of programs is supported.
 +dlopen_self=$enable_dlopen_self
  
+-    ;;
+-  esac
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  
 -    save_LDFLAGS="$LDFLAGS"
 -    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -9825,21 +17000,21 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15468 "configure"
+-#line 15471 "configure"
 -#include "confdefs.h"
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
- 
--#include <stdio.h>
 +# Library versioning type.
 +version_type=$version_type
  
+-#include <stdio.h>
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -9849,8 +17024,9 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -9873,26 +17049,25 @@
 -#    endif
 -#  endif
 -#endif
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
 -  if (self)
 -    {
@@ -9900,8 +17075,8 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
  
 -    exit (status);
 -}
@@ -9924,22 +17099,23 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
- 
 +# Commands used to build and install a shared archive.
 +archive_cmds=$lt_archive_cmds_CXX
 +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
 +postinstall_cmds=$lt_postinstall_cmds
 +postuninstall_cmds=$lt_postuninstall_cmds
  
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +# Commands used to build a loadable module (assumed same as above if empty)
 +module_cmds=$lt_module_cmds_CXX
 +module_expsym_cmds=$lt_module_expsym_cmds_CXX
  
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
 -      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -9953,23 +17129,23 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15566 "configure"
+-#line 15569 "configure"
 -#include "confdefs.h"
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Dependencies to place before the objects being linked to create a
++# Dependencies to place after the objects being linked to create a
 +# shared library.
-+predep_objects=$lt_predep_objects_CXX
++postdep_objects=$lt_postdep_objects_CXX
  
 -#include <stdio.h>
-+# Dependencies to place after the objects being linked to create a
++# Dependencies to place before the objects being linked to create a
 +# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
++predeps=$lt_predeps_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -9980,9 +17156,9 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Dependencies to place before the objects being linked to create a
++# Dependencies to place after the objects being linked to create a
 +# shared library.
-+predeps=$lt_predeps_CXX
++postdeps=$lt_postdeps_CXX
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -10005,24 +17181,33 @@
 -#    endif
 -#  endif
 -#endif
--
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+ 
 -    exit (status);
 -}
 -EOF
@@ -10044,31 +17229,43 @@
 -  fi
 -fi
 -rm -fr conftest*
--
--
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
--
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+ 
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
--
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
--
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
 -fi
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
 -
--
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
 -# with your package, and you will get complaints that there are
@@ -10345,13 +17542,46 @@
 -# Dependencies to place after the objects being linked to create a
 -# shared library.
 -postdeps=$lt_postdeps_CXX
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
  
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -16058,7 +15876,10 @@
+ # This is the shared library path variable.
+ shlibpath_var=$shlibpath_var
+@@ -16061,7 +16872,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.
@@ -10363,7 +17593,7 @@
  fi
  
  
-@@ -16130,16 +15951,42 @@
+@@ -16133,29 +16947,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -10403,12 +17633,23 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
+ 
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
 +
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
  
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16152,7 +15999,7 @@
- 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -10416,7 +17657,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16160,8 +16007,10 @@
+@@ -16163,21 +17003,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -10428,17 +17669,38 @@
 +  fi
    ;;
  esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16174,8 +16023,6 @@
- echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
  
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
+-
 -test "$ld_shlibs_F77" = no && can_build_shared=no
--
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+ 
  GCC_F77="$G77"
  LD_F77="$LD"
+@@ -16186,8 +17026,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
  
-@@ -16222,6 +16069,11 @@
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl_F77='-Wl,'
+@@ -16225,6 +17065,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -10450,7 +17712,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16238,7 +16090,7 @@
+@@ -16241,7 +17086,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -10459,7 +17721,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16264,6 +16116,16 @@
+@@ -16267,6 +17112,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -10476,7 +17738,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16275,7 +16137,7 @@
+@@ -16278,7 +17133,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.
@@ -10485,7 +17747,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16298,13 +16160,20 @@
+@@ -16301,13 +17156,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -10508,7 +17770,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16319,15 +16188,15 @@
+@@ -16322,15 +17184,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -10530,7 +17792,7 @@
        ;;
  
      sunos4*)
-@@ -16336,7 +16205,7 @@
+@@ -16339,7 +17201,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -10539,7 +17801,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16349,6 +16218,17 @@
+@@ -16352,6 +17214,17 @@
        fi
        ;;
  
@@ -10557,7 +17819,28 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16383,18 +16263,20 @@
+@@ -16363,16 +17236,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16386,26 +17259,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -10565,13 +17848,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16389: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16269: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16392: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17265: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16393: \$? = $ac_status" >&5
-+   echo "$as_me:16273: \$? = $ac_status" >&5
+-   echo "$as_me:16396: \$? = $ac_status" >&5
++   echo "$as_me:17269: \$? = $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
@@ -10583,25 +17866,37 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-@@ -16415,7 +16297,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+     case $lt_prog_compiler_pic_F77 in
+@@ -16418,7 +17293,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=
-@@ -16425,6 +16307,48 @@
+@@ -16428,8 +17303,50 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_F77+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -10628,8 +17923,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_F77" = xyes; then
 +    :
@@ -10638,10 +17933,12 @@
 +fi
 +
 +
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16437,38 +16361,36 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16440,60 +17357,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -10662,13 +17959,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16456: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16373: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16459: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17369: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16460: \$? = $ac_status" >&5
-+   echo "$as_me:16377: \$? = $ac_status" >&5
+-   echo "$as_me:16463: \$? = $ac_status" >&5
++   echo "$as_me:17373: \$? = $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
@@ -10692,7 +17989,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16539,6 +16461,16 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -16503,8 +17418,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   runpath_var=
+   allow_undefined_flag_F77=
+@@ -16542,6 +17457,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -10709,7 +18045,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16549,6 +16481,10 @@
+@@ -16552,6 +17477,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -10720,7 +18056,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16559,6 +16495,27 @@
+@@ -16562,6 +17491,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -10748,7 +18084,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16596,7 +16553,7 @@
+@@ -16599,7 +17549,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -10757,7 +18093,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16606,13 +16563,13 @@
+@@ -16609,13 +17559,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'
@@ -10774,7 +18110,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16621,23 +16578,70 @@
+@@ -16624,23 +17574,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -10851,7 +18187,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16651,13 +16655,40 @@
+@@ -16654,13 +17651,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10894,7 +18230,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16667,24 +16698,19 @@
+@@ -16670,24 +17694,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10926,7 +18262,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16696,7 +16722,7 @@
+@@ -16699,7 +17718,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -10935,7 +18271,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16718,9 +16744,21 @@
+@@ -16721,9 +17740,21 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -10959,7 +18295,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16737,7 +16775,7 @@
+@@ -16740,7 +17771,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -10968,7 +18304,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16756,8 +16794,12 @@
+@@ -16759,8 +17790,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -10981,7 +18317,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16765,22 +16807,23 @@
+@@ -16768,22 +17803,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -11012,17 +18348,14 @@
        program main
  
        end
-@@ -16794,8 +16837,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -16822,14 +16864,13 @@
+@@ -16820,19 +17856,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -11040,17 +18373,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16846,8 +16887,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -16879,13 +16919,11 @@
+@@ -16872,7 +17909,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -16882,13 +17921,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -11067,7 +18400,7 @@
  	fi
        fi
        ;;
-@@ -16898,7 +16936,7 @@
+@@ -16901,7 +17938,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -11076,7 +18409,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16908,68 +16946,68 @@
+@@ -16911,68 +17948,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -11189,7 +18522,7 @@
      fi
        ;;
  
-@@ -17003,8 +17041,8 @@
+@@ -17006,8 +18043,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -11200,7 +18533,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17012,7 +17050,7 @@
+@@ -17015,7 +18052,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -11209,7 +18542,7 @@
        else
  	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -17026,47 +17064,62 @@
+@@ -17029,47 +18066,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -11296,7 +18629,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17080,7 +17133,7 @@
+@@ -17083,7 +18135,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -11305,7 +18638,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'
-@@ -17090,7 +17143,7 @@
+@@ -17093,7 +18145,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -11314,7 +18647,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17113,7 +17166,8 @@
+@@ -17116,7 +18168,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
@@ -11324,7 +18657,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17123,7 +17177,7 @@
+@@ -17126,7 +18179,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -11333,7 +18666,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17134,14 +17188,14 @@
+@@ -17137,14 +18190,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -11350,7 +18683,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'
-@@ -17153,13 +17207,13 @@
+@@ -17156,13 +18209,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -11366,7 +18699,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17167,21 +17221,15 @@
+@@ -17170,21 +18223,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -11392,7 +18725,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17190,8 +17238,18 @@
+@@ -17193,8 +18240,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -11413,7 +18746,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17200,7 +17258,7 @@
+@@ -17203,7 +18260,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.
@@ -11422,7 +18755,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17248,36 +17306,45 @@
+@@ -17251,36 +18308,45 @@
        fi
        ;;
  
@@ -11489,8 +18822,14 @@
        ;;
  
      uts4*)
-@@ -17296,11 +17363,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
+@@ -17295,15 +18361,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -11501,7 +18840,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17333,6 +17395,7 @@
+@@ -17321,8 +18382,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -17336,6 +18397,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -11509,7 +18859,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17368,7 +17431,7 @@
+@@ -17358,20 +18420,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -11518,7 +18885,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17378,7 +17441,20 @@
+@@ -17381,7 +18443,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -11540,7 +18907,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17443,7 +17519,7 @@
+@@ -17446,7 +18521,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11549,7 +18916,7 @@
    ;;
  
  beos*)
-@@ -17452,7 +17528,7 @@
+@@ -17455,7 +18530,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -11558,7 +18925,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17468,7 +17544,7 @@
+@@ -17471,7 +18546,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -11567,7 +18934,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17480,7 +17556,8 @@
+@@ -17483,7 +18558,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -11577,7 +18944,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17510,7 +17587,7 @@
+@@ -17513,7 +18589,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11586,7 +18953,7 @@
        ;;
      esac
      ;;
-@@ -17533,7 +17610,7 @@
+@@ -17536,7 +18612,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -11595,7 +18962,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17556,20 +17633,17 @@
+@@ -17559,20 +18635,17 @@
    dynamic_linker=no
    ;;
  
@@ -11627,7 +18994,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17587,14 +17661,19 @@
+@@ -17590,14 +18663,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -11649,7 +19016,7 @@
    esac
    ;;
  
-@@ -17614,9 +17693,9 @@
+@@ -17617,9 +18695,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -11661,7 +19028,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17631,7 +17710,7 @@
+@@ -17634,7 +18712,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -11670,7 +19037,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17642,7 +17721,7 @@
+@@ -17645,7 +18723,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -11679,7 +19046,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17654,6 +17733,18 @@
+@@ -17657,6 +18735,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -11698,7 +19065,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17697,29 +17788,26 @@
+@@ -17700,29 +18790,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -11735,14 +19102,17 @@
    # 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,
-@@ -17729,6 +17817,18 @@
+@@ -17732,16 +18819,28 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
+-netbsd*)
+-  version_type=sunos
 +netbsdelf*-gnu)
 +  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -11751,10 +19121,12 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -17738,7 +17838,7 @@
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -11763,7 +19135,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17766,8 +17866,13 @@
+@@ -17769,8 +18868,13 @@
  
  openbsd*)
    version_type=sunos
@@ -11778,7 +19150,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17787,7 +17892,7 @@
+@@ -17790,7 +18894,7 @@
  
  os2*)
    libname_spec='$name'
@@ -11787,7 +19159,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17805,13 +17910,6 @@
+@@ -17808,13 +18912,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -11801,7 +19173,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17837,7 +17935,7 @@
+@@ -17840,7 +18937,7 @@
    need_version=yes
    ;;
  
@@ -11810,7 +19182,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17870,6 +17968,29 @@
+@@ -17873,6 +18970,29 @@
    fi
    ;;
  
@@ -11840,17 +19212,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17885,12 +18006,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -17884,16 +19004,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
 -   test -n "$runpath_var F77" || \
@@ -11860,7 +19240,18 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17922,36 +18048,6 @@
+@@ -17913,8 +19038,8 @@
+   # directories.
+   hardcode_action_F77=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
+ 
+ if test "$hardcode_action_F77" = relink; then
+   # Fast installation is not supported
+@@ -17925,36 +19050,6 @@
    enable_fast_install=needless
  fi
  
@@ -11897,7 +19288,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17966,7 +18062,8 @@
+@@ -17969,7 +19064,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.
@@ -11907,7 +19298,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 \
-@@ -18066,6 +18163,12 @@
+@@ -18069,6 +19165,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -11920,7 +19311,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18077,6 +18180,9 @@
+@@ -18080,6 +19182,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -11930,7 +19321,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18096,7 +18202,7 @@
+@@ -18099,7 +19204,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -11939,7 +19330,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18127,7 +18233,7 @@
+@@ -18130,7 +19235,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -11948,7 +19339,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18142,7 +18248,7 @@
+@@ -18145,7 +19250,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -11957,7 +19348,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18344,7 +18450,10 @@
+@@ -18347,7 +19452,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.
@@ -11969,7 +19360,15 @@
  fi
  
  
-@@ -18377,26 +18486,55 @@
+@@ -18368,7 +19476,6 @@
+ 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ 
+ 
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
+ 
+@@ -18380,26 +19487,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -12026,7 +19425,18 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -18423,18 +18561,20 @@
+@@ -18411,8 +19547,8 @@
+   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+ 
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18426,26 +19562,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -12034,13 +19444,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18429: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18567: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18432: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19568: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18433: \$? = $ac_status" >&5
-+   echo "$as_me:18571: \$? = $ac_status" >&5
+-   echo "$as_me:18436: \$? = $ac_status" >&5
++   echo "$as_me:19572: \$? = $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
@@ -12052,7 +19462,28 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -18495,6 +18635,11 @@
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+@@ -18459,8 +19597,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18498,6 +19636,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -12064,7 +19495,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18511,7 +18656,7 @@
+@@ -18514,7 +19657,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -12073,7 +19504,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18537,6 +18682,16 @@
+@@ -18540,6 +19683,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -12090,7 +19521,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18548,7 +18703,7 @@
+@@ -18551,7 +19704,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.
@@ -12099,7 +19530,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18571,13 +18726,20 @@
+@@ -18574,13 +19727,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -12122,7 +19553,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18592,15 +18754,15 @@
+@@ -18595,15 +19755,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -12144,7 +19575,7 @@
        ;;
  
      sunos4*)
-@@ -18609,7 +18771,7 @@
+@@ -18612,7 +19772,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -12153,7 +19584,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18622,6 +18784,17 @@
+@@ -18625,6 +19785,17 @@
        fi
        ;;
  
@@ -12171,7 +19602,28 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18656,18 +18829,20 @@
+@@ -18636,16 +19807,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18659,26 +19830,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -12179,13 +19631,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18662: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18835: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18665: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19836: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18666: \$? = $ac_status" >&5
-+   echo "$as_me:18839: \$? = $ac_status" >&5
+-   echo "$as_me:18669: \$? = $ac_status" >&5
++   echo "$as_me:19840: \$? = $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
@@ -12197,25 +19649,37 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-@@ -18688,7 +18863,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+     case $lt_prog_compiler_pic_GCJ in
+@@ -18691,7 +19864,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=
-@@ -18698,6 +18873,48 @@
+@@ -18701,8 +19874,50 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -12242,8 +19706,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
 +    :
@@ -12252,10 +19716,12 @@
 +fi
 +
 +
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18710,38 +18927,36 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18713,60 +19928,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -12276,13 +19742,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18729: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18939: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18732: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19940: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18733: \$? = $ac_status" >&5
-+   echo "$as_me:18943: \$? = $ac_status" >&5
+-   echo "$as_me:18736: \$? = $ac_status" >&5
++   echo "$as_me:19944: \$? = $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
@@ -12306,7 +19772,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18812,6 +19027,16 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -18776,8 +19989,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   runpath_var=
+   allow_undefined_flag_GCJ=
+@@ -18815,6 +20028,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -12323,7 +19828,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18822,6 +19047,10 @@
+@@ -18825,6 +20048,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -12334,7 +19839,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18832,6 +19061,27 @@
+@@ -18835,6 +20062,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -12362,7 +19867,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18869,7 +19119,7 @@
+@@ -18872,7 +20120,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -12371,7 +19876,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18879,13 +19129,13 @@
+@@ -18882,13 +20130,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'
@@ -12388,7 +19893,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18894,23 +19144,70 @@
+@@ -18897,23 +20145,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -12465,7 +19970,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18924,13 +19221,40 @@
+@@ -18927,13 +20222,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12508,7 +20013,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18940,24 +19264,19 @@
+@@ -18943,24 +20265,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12540,7 +20045,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18969,7 +19288,7 @@
+@@ -18972,7 +20289,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -12549,7 +20054,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18991,9 +19310,21 @@
+@@ -18994,9 +20311,21 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -12573,7 +20078,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19010,7 +19341,7 @@
+@@ -19013,7 +20342,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -12582,7 +20087,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -19029,8 +19360,12 @@
+@@ -19032,8 +20361,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -12595,7 +20100,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19038,22 +19373,23 @@
+@@ -19041,22 +20374,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -12626,17 +20131,14 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19077,8 +19413,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=$?
-@@ -19105,14 +19440,13 @@
+@@ -19103,19 +20437,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -12654,17 +20156,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19139,8 +19473,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=$?
-@@ -19172,13 +19505,11 @@
+@@ -19165,7 +20500,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -19175,13 +20512,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -12681,7 +20183,7 @@
  	fi
        fi
        ;;
-@@ -19191,7 +19522,7 @@
+@@ -19194,7 +20529,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -12690,7 +20192,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19201,68 +19532,68 @@
+@@ -19204,68 +20539,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -12803,7 +20305,7 @@
      fi
        ;;
  
-@@ -19296,8 +19627,8 @@
+@@ -19299,8 +20634,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12814,7 +20316,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19305,7 +19636,7 @@
+@@ -19308,7 +20643,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -12823,7 +20325,7 @@
        else
  	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -19319,47 +19650,62 @@
+@@ -19322,47 +20657,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -12910,7 +20412,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19373,7 +19719,7 @@
+@@ -19376,7 +20726,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -12919,7 +20421,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'
-@@ -19383,7 +19729,7 @@
+@@ -19386,7 +20736,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -12928,7 +20430,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19406,7 +19752,8 @@
+@@ -19409,7 +20759,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
@@ -12938,7 +20440,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19416,7 +19763,7 @@
+@@ -19419,7 +20770,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -12947,7 +20449,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19427,14 +19774,14 @@
+@@ -19430,14 +20781,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -12964,7 +20466,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'
-@@ -19446,13 +19793,13 @@
+@@ -19449,13 +20800,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -12980,7 +20482,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19460,21 +19807,15 @@
+@@ -19463,21 +20814,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -13006,7 +20508,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19483,8 +19824,18 @@
+@@ -19486,8 +20831,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13027,7 +20529,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19493,7 +19844,7 @@
+@@ -19496,7 +20851,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.
@@ -13036,7 +20538,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19541,36 +19892,45 @@
+@@ -19544,36 +20899,45 @@
        fi
        ;;
  
@@ -13103,8 +20605,14 @@
        ;;
  
      uts4*)
-@@ -19589,11 +19949,6 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+@@ -19588,15 +20952,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -13115,7 +20623,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19626,6 +19981,7 @@
+@@ -19614,8 +20973,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -19629,6 +20988,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -13123,7 +20642,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19661,7 +20017,7 @@
+@@ -19651,20 +21011,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -13132,7 +20668,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19671,7 +20027,20 @@
+@@ -19674,7 +21034,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13154,7 +20690,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19736,7 +20105,7 @@
+@@ -19739,7 +21112,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13163,7 +20699,7 @@
    ;;
  
  beos*)
-@@ -19745,7 +20114,7 @@
+@@ -19748,7 +21121,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -13172,7 +20708,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19761,7 +20130,7 @@
+@@ -19764,7 +21137,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -13181,7 +20717,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19773,7 +20142,8 @@
+@@ -19776,7 +21149,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -13191,7 +20727,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19803,7 +20173,7 @@
+@@ -19806,7 +21180,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13200,7 +20736,7 @@
        ;;
      esac
      ;;
-@@ -19826,7 +20196,7 @@
+@@ -19829,7 +21203,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -13209,7 +20745,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19849,20 +20219,17 @@
+@@ -19852,20 +21226,17 @@
    dynamic_linker=no
    ;;
  
@@ -13241,7 +20777,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19880,14 +20247,19 @@
+@@ -19883,14 +21254,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -13263,7 +20799,7 @@
    esac
    ;;
  
-@@ -19907,9 +20279,9 @@
+@@ -19910,9 +21286,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -13275,7 +20811,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19924,7 +20296,7 @@
+@@ -19927,7 +21303,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -13284,7 +20820,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19935,7 +20307,7 @@
+@@ -19938,7 +21314,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -13293,7 +20829,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19947,6 +20319,18 @@
+@@ -19950,6 +21326,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -13312,18 +20848,17 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -19990,1064 +20374,264 @@
+@@ -19993,1064 +21381,264 @@
    ;;
  
  # This must be Linux ELF.
 -linux*)
-+linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
@@ -13433,10 +20968,11 @@
 -  ;;
 -
 -solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
@@ -13461,7 +20997,7 @@
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 -  soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_var=LD_LIBRARY_PATH
 -  case $host_vendor in
 -    sni)
 -      shlibpath_overrides_runpath=no
@@ -14135,6 +21671,9 @@
 -
 -
 -fi
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  # This implies no fast_install, which is unacceptable.
 +  # Some rework will be needed to allow for fast_install
@@ -14259,7 +21798,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20852 "configure"
+-#line 20855 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
@@ -14447,7 +21986,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20950 "configure"
+-#line 20953 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
@@ -14516,8 +22055,8 @@
 +  dynamic_linker=no
 +  ;;
 +esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
 +test "$dynamic_linker" = no && can_build_shared=no
  
 -    exit (status);
@@ -14545,8 +22084,8 @@
  fi
 -rm -fr conftest*
  
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 +hardcode_action_GCJ=
 +if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 +   test -n "$runpath_var_GCJ" || \
@@ -14584,8 +22123,8 @@
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
  
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -14601,7 +22140,7 @@
  fi
  
  
-@@ -21064,7 +20648,8 @@
+@@ -21067,7 +21655,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.
@@ -14611,7 +22150,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 \
-@@ -21164,6 +20749,12 @@
+@@ -21167,6 +21756,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -14624,7 +22163,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21175,6 +20766,9 @@
+@@ -21178,6 +21773,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -14634,7 +22173,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21194,7 +20788,7 @@
+@@ -21197,7 +21795,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -14643,7 +22182,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21225,7 +20819,7 @@
+@@ -21228,7 +21826,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -14652,7 +22191,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21240,7 +20834,7 @@
+@@ -21243,7 +21841,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -14661,7 +22200,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21442,7 +21036,10 @@
+@@ -21445,7 +22043,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.
@@ -14673,7 +22212,15 @@
  fi
  
  
-@@ -21481,15 +21078,42 @@
+@@ -21465,7 +22066,6 @@
+       RC)
+ 
+ 
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
+ 
+@@ -21484,15 +22084,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14716,7 +22263,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21505,7 +21129,8 @@
+@@ -21508,7 +22135,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.
@@ -14726,7 +22273,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 \
-@@ -21605,6 +21230,12 @@
+@@ -21608,6 +22236,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -14739,7 +22286,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21616,6 +21247,9 @@
+@@ -21619,6 +22253,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -14749,7 +22296,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21635,7 +21269,7 @@
+@@ -21638,7 +22275,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -14758,7 +22305,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21666,7 +21300,7 @@
+@@ -21669,7 +22306,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -14767,7 +22314,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21681,7 +21315,7 @@
+@@ -21684,7 +22321,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -14776,7 +22323,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21883,7 +21517,10 @@
+@@ -21886,7 +22523,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.
@@ -14788,7 +22335,7 @@
  fi
  
  
-@@ -21930,7 +21567,7 @@
+@@ -21933,7 +22573,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -14797,17 +22344,182 @@
  
  # Prevent multiple expansion
  
-@@ -22171,8 +21808,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=$?
-@@ -22246,9 +21882,6 @@
+@@ -21988,8 +22628,8 @@
+ 
+     # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22015,17 +22655,17 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test -n "$MSGFMT"; then
+-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6
++  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+     # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22040,32 +22680,33 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+   ;;
+ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+-
+ if test -n "$GMSGFMT"; then
+-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-echo "${ECHO_T}$GMSGFMT" >&6
++  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
+-        echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
++        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+         GMSGFMT=":"
+       fi
+       MSGFMT=$GMSGFMT
+@@ -22074,8 +22715,8 @@
+ 
+       # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22101,11 +22742,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test -n "$XGETTEXT"; then
+-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6
++  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -22113,8 +22754,8 @@
+ 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ 	  : ;
+ 	else
+-	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
++	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
+ 	  XGETTEXT=":"
+ 	fi
+       fi
+@@ -22124,8 +22765,7 @@
+ 
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22137,8 +22777,8 @@
+     ac_save_CXXFLAGS="$CXXFLAGS"
+     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+ 
+-    echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
++echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
+     if test "${kde_cv_stl_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22192,15 +22832,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_stl_works=no
++	kde_cv_stl_works=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
+-echo "${ECHO_T}$kde_cv_stl_works" >&6
++   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
++echo "${ECHO_T}$kde_cv_stl_works" >&6; }
+ 
+    if test "$kde_cv_stl_works" = "yes"; then
+      # back compatible
+@@ -22229,15 +22870,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcat" >&5
+-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcat" >&5
++echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22249,9 +22889,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14817,27 +22529,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22282,8 +21915,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=$?
-@@ -22387,8 +22019,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=$?
-@@ -22467,9 +22098,6 @@
+@@ -22303,8 +22940,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcat=no
++	kde_cv_func_strlcat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22318,11 +22956,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
++echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
++echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22343,8 +22981,7 @@
+ if test "x$kde_cv_proto_strlcat" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22409,9 +23046,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcat="strlcat unavailable"
++	kde_cv_proto_strlcat="strlcat unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22425,8 +23063,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
+ 
+ if test "x$kde_cv_func_strlcat" = xyes; then
+ 
+@@ -22450,15 +23088,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcpy" >&5
+-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcpy" >&5
++echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22470,9 +23107,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14847,247 +22618,1341 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22502,8 +22130,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=$?
-@@ -22606,8 +22233,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=$?
-@@ -22697,8 +22323,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=$?
-@@ -22759,8 +22384,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=$?
-@@ -22828,8 +22452,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=$?
-@@ -22895,8 +22518,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=$?
-@@ -22989,8 +22611,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=$?
-@@ -23068,8 +22689,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=$?
-@@ -23153,8 +22773,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=$?
-@@ -23222,8 +22841,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=$?
-@@ -23318,8 +22936,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=$?
-@@ -23383,8 +23000,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=$?
-@@ -23479,8 +23095,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=$?
-@@ -23544,8 +23159,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=$?
-@@ -23641,8 +23255,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=$?
-@@ -23706,8 +23319,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=$?
-@@ -23804,8 +23416,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=$?
-@@ -23870,8 +23481,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=$?
-@@ -23939,8 +23549,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=$?
-@@ -24091,8 +23700,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=$?
-@@ -24247,8 +23855,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=$?
-@@ -24313,8 +23920,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=$?
-@@ -24461,8 +24067,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=$?
-@@ -24617,8 +24222,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=$?
-@@ -24674,9 +24278,6 @@
+@@ -22523,8 +23157,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcpy=no
++	kde_cv_func_strlcpy=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22538,11 +23173,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
++echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22563,8 +23198,7 @@
+ if test "x$kde_cv_proto_strlcpy" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22628,9 +23262,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcpy="strlcpy unavailable"
++	kde_cv_proto_strlcpy="strlcpy unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22644,8 +23279,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
+ 
+ if test "x$kde_cv_func_strlcpy" = xyes; then
+ 
+@@ -22668,8 +23303,8 @@
+ 
+ 
+ 
+-      echo "$as_me:$LINENO: checking for main in -lutil" >&5
+-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
++echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22686,7 +23321,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -22718,20 +23353,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_util_main=no
++	ac_cv_lib_util_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
++echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
+ if test $ac_cv_lib_util_main = yes; then
+   LIBUTIL="-lutil"
+ fi
+ 
+-   echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
++echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_compat_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22748,7 +23384,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -22780,21 +23416,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_compat_main=no
++	ac_cv_lib_compat_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
++echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
+ if test $ac_cv_lib_compat_main = yes; then
+   LIBCOMPAT="-lcompat"
+ fi
+ 
+    kde_have_crypt=
+-   echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22807,17 +23444,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+   ;
+   return 0;
+ }
+@@ -22849,19 +23486,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypt_crypt=no
++	ac_cv_lib_crypt_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
+ if test $ac_cv_lib_crypt_crypt = yes; then
+   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
+ else
+-  echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
++echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22874,17 +23512,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+   ;
+   return 0;
+ }
+@@ -22916,14 +23554,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_c_crypt=no
++	ac_cv_lib_c_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
+ if test $ac_cv_lib_c_crypt = yes; then
+   kde_have_crypt=yes
+ else
+@@ -22949,13 +23588,13 @@
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for socklen_t" >&5
+-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+    if test "${kde_cv_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-      ac_ext=cc
++      ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -23013,7 +23652,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+       ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23024,17 +23665,17 @@
+ 
+ fi
+ 
+-   echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t" >&6
++   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
++echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
+    if test $kde_cv_socklen_t = no; then
+-      echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
++echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
+       if test "${kde_cv_socklen_t_equiv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+          kde_cv_socklen_t_equiv=int
+-         ac_ext=cc
++         ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -23092,7 +23733,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+          done
+          ac_ext=c
+@@ -23104,8 +23747,8 @@
+ 
+ fi
+ 
+-      echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
++echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
+    fi
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -23118,8 +23761,8 @@
+ _ACEOF
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23132,17 +23775,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23174,21 +23817,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_dnet_ntoa=no
++	ac_cv_lib_dnet_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23201,17 +23845,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23243,21 +23887,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_stub_dnet_ntoa=no
++	ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
++echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
+ if test "${ac_cv_func_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23284,30 +23929,24 @@
+ 
+ #undef inet_ntoa
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char inet_ntoa ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
++#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
+ choke me
+-#else
+-char (*f) () = inet_ntoa;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != inet_ntoa;
++return inet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23339,17 +23978,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_inet_ntoa=no
++	ac_cv_func_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
+ 
+    if test $ac_cv_func_inet_ntoa = no; then
+-     echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
++echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23362,17 +24002,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char inet_ntoa ();
+ int
+ main ()
+ {
+-inet_ntoa ();
++return inet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23404,21 +24044,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_inet_ntoa=no
++	ac_cv_lib_nsl_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for connect" >&5
+-echo $ECHO_N "checking for connect... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23445,30 +24086,24 @@
+ 
+ #undef connect
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char connect ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_connect) || defined (__stub___connect)
++#if defined __stub_connect || defined __stub___connect
+ choke me
+-#else
+-char (*f) () = connect;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != connect;
++return connect ();
+   ;
+   return 0;
+ }
+@@ -23500,17 +24135,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_connect=no
++	ac_cv_func_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+ 
+    if test $ac_cv_func_connect = no; then
+-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23523,17 +24159,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char connect ();
+ int
+ main ()
+ {
+-connect ();
++return connect ();
+   ;
+   return 0;
+ }
+@@ -23565,22 +24201,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_socket_connect=no
++	ac_cv_lib_socket_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for remove" >&5
+-echo $ECHO_N "checking for remove... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23607,30 +24244,24 @@
+ 
+ #undef remove
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char remove ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_remove) || defined (__stub___remove)
++#if defined __stub_remove || defined __stub___remove
+ choke me
+-#else
+-char (*f) () = remove;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != remove;
++return remove ();
+   ;
+   return 0;
+ }
+@@ -23662,17 +24293,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_remove=no
++	ac_cv_func_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-echo "${ECHO_T}$ac_cv_func_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+ 
+    if test $ac_cv_func_remove = no; then
+-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23685,17 +24317,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char remove ();
+ int
+ main ()
+ {
+-remove ();
++return remove ();
+   ;
+   return 0;
+ }
+@@ -23727,14 +24359,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_posix_remove=no
++	ac_cv_lib_posix_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -23742,8 +24375,8 @@
+    fi
+ 
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-   echo "$as_me:$LINENO: checking for shmat" >&5
+-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23770,30 +24403,24 @@
+ 
+ #undef shmat
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shmat ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shmat) || defined (__stub___shmat)
++#if defined __stub_shmat || defined __stub___shmat
+ choke me
+-#else
+-char (*f) () = shmat;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != shmat;
++return shmat ();
+   ;
+   return 0;
+ }
+@@ -23825,18 +24452,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_shmat=no
++	ac_cv_func_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-echo "${ECHO_T}$ac_cv_func_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+ if test $ac_cv_func_shmat = yes; then
+   :
+ else
+-  echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23849,17 +24477,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shmat ();
+ int
+ main ()
+ {
+-shmat ();
++return shmat ();
+   ;
+   return 0;
+ }
+@@ -23891,14 +24519,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ipc_shmat=no
++	ac_cv_lib_ipc_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -23912,18 +24541,19 @@
+ for ac_header in sys/types.h stdint.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23960,15 +24590,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24002,9 +24633,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24028,25 +24660,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24064,18 +24690,19 @@
+ for ac_header in sys/bitypes.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24112,15 +24739,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24154,9 +24782,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24180,25 +24809,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24212,8 +24835,8 @@
+ 
+ 
+    # darwin requires a poll emulation library
+-   echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
++echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_poll_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24226,17 +24849,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char poll ();
+ int
+ main ()
+ {
+-poll ();
++return poll ();
+   ;
+   return 0;
+ }
+@@ -24268,14 +24891,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_poll_poll=no
++	ac_cv_lib_poll_poll=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
++echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
+ if test $ac_cv_lib_poll_poll = yes; then
+   LIB_POLL="-lpoll"
+ fi
+@@ -24286,18 +24910,19 @@
+ for ac_header in Carbon/Carbon.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24334,15 +24959,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24376,9 +25002,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24402,25 +25029,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24435,17 +25056,17 @@
+ 
+    # CoreAudio framework
+    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24482,15 +25103,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24524,9 +25146,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24550,25 +25173,18 @@
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+@@ -24585,8 +25201,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
++echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
+   kde_libs_safe="$LIBS"
+   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -24635,8 +25251,8 @@
+   (exit $ac_status); }; }; then
+ 
+       LIBRESOLV="-lresolv"
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RES_INIT 1
+@@ -24647,25 +25263,25 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	 { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   LIBS=$kde_libs_safe
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${kde_cv_func_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -24677,9 +25293,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15097,918 +23962,5154 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24710,8 +24311,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=$?
-@@ -24815,8 +24415,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=$?
-@@ -24916,8 +24515,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=$?
-@@ -24991,8 +24589,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=$?
-@@ -25055,8 +24652,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=$?
-@@ -25118,8 +24714,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=$?
-@@ -25159,8 +24754,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=$?
-@@ -25216,8 +24810,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=$?
-@@ -25257,8 +24850,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=$?
-@@ -25322,8 +24914,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=$?
-@@ -25354,10 +24945,8 @@
+@@ -24731,8 +25344,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_res_init=no
++	kde_cv_func_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -24746,11 +25360,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+-echo "${ECHO_T}$kde_cv_func_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
++echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
++echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24771,8 +25385,7 @@
+ if test "x$kde_cv_proto_res_init" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -24837,9 +25450,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_res_init="res_init unavailable"
++	kde_cv_proto_res_init="res_init unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -24853,8 +25467,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
++echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
+ 
+ if test "x$kde_cv_func_res_init" = xyes; then
+ 
+@@ -24881,8 +25495,8 @@
+    LIBSOCKET="$X_EXTRA_LIBS"
+ 
+ 
+-   echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
++echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ucb_killpg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24895,17 +25509,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char killpg ();
+ int
+ main ()
+ {
+-killpg ();
++return killpg ();
+   ;
+   return 0;
+ }
+@@ -24937,27 +25551,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ucb_killpg=no
++	ac_cv_lib_ucb_killpg=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
+ if test $ac_cv_lib_ucb_killpg = yes; then
+   LIBUCB="-lucb"
+ fi
+ 
+ 
+    case $host in     *-*-lynxos* )
+-        echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
++echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
+         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+-        echo "$as_me:$LINENO: result: disabled" >&5
+-echo "${ECHO_T}disabled" >&6
+-        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6; }
++        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24970,17 +25585,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char gethostbyname ();
+ int
+ main ()
+ {
+-gethostbyname ();
++return gethostbyname ();
+   ;
+   return 0;
+ }
+@@ -25012,22 +25627,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_bsd_gethostbyname=no
++	ac_cv_lib_bsd_gethostbyname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   LIBSOCKET="-lbsd"
+ fi
+           ;;
+     esac
+ 
+-     echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25038,12 +25654,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int ac__type_new_;
+ int
+ main ()
+ {
+-if ((int *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (int))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -25076,20 +25693,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_int=no
++	ac_cv_type_int=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_int" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25102,10 +25720,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25143,10 +25762,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25180,30 +25800,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25241,10 +25863,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25278,23 +25901,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25306,10 +25932,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25343,26 +25970,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25370,8 +25991,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++		   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25380,22 +26002,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (int))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -25419,28 +26041,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -25468,8 +25057,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=$?
-@@ -25531,8 +25119,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=$?
-@@ -25572,8 +25159,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=$?
-@@ -25629,8 +25215,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=$?
-@@ -25670,8 +25255,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=$?
-@@ -25735,8 +25319,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=$?
-@@ -25767,10 +25350,8 @@
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+-   echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25451,12 +26072,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef short ac__type_new_;
+ int
+ main ()
+ {
+-if ((short *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (short))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -25489,20 +26111,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_short=no
++	ac_cv_type_short=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_short" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25515,10 +26138,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25556,10 +26180,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25593,30 +26218,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25654,10 +26281,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25691,23 +26319,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25719,10 +26350,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25756,26 +26388,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25783,8 +26409,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++		   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25793,22 +26420,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (short))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -25832,28 +26459,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -25881,8 +25462,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=$?
-@@ -25944,8 +25524,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=$?
-@@ -25985,8 +25564,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=$?
-@@ -26042,8 +25620,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=$?
-@@ -26083,8 +25660,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=$?
-@@ -26148,8 +25724,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=$?
-@@ -26180,10 +25755,8 @@
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25864,12 +26490,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef long ac__type_new_;
+ int
+ main ()
+ {
+-if ((long *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (long))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -25902,20 +26529,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
++	ac_cv_type_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25928,10 +26556,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25969,10 +26598,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26006,30 +26636,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26067,10 +26699,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26104,23 +26737,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26132,10 +26768,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26169,26 +26806,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26196,8 +26827,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++		   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26206,22 +26838,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -26245,28 +26877,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -26294,8 +25867,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=$?
-@@ -26357,8 +25929,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=$?
-@@ -26398,8 +25969,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=$?
-@@ -26455,8 +26025,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=$?
-@@ -26496,8 +26065,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=$?
-@@ -26561,8 +26129,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=$?
-@@ -26593,10 +26160,8 @@
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for char *" >&5
+-echo $ECHO_N "checking for char *... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for char *" >&5
++echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26277,12 +26908,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef char * ac__type_new_;
+ int
+ main ()
+ {
+-if ((char * *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (char *))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -26315,20 +26947,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_char_p=no
++	ac_cv_type_char_p=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+-echo "${ECHO_T}$ac_cv_type_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
++echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of char *" >&5
+-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of char *" >&5
++echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_char_p" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -26341,10 +26974,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26382,10 +27016,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26419,30 +27054,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26480,10 +27117,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26517,23 +27155,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26545,10 +27186,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26582,26 +27224,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26609,8 +27245,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char *)); }
+-unsigned long ulongval () { return (long) (sizeof (char *)); }
++		   typedef char * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26619,22 +27256,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (char *))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -26658,30 +27295,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -26715,8 +26280,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=$?
-@@ -26787,8 +26351,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=$?
-@@ -26858,8 +26421,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=$?
-@@ -26921,8 +26483,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=$?
-@@ -26962,8 +26523,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=$?
-@@ -27019,8 +26579,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=$?
-@@ -27060,8 +26619,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=$?
-@@ -27125,8 +26683,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=$?
-@@ -27157,10 +26714,8 @@
+   ac_cv_sizeof_char_p=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26694,17 +27330,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -26736,14 +27372,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ 
+ LIBDL="-ldl"
+@@ -26752,8 +27389,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
++echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26766,17 +27403,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_unload ();
+ int
+ main ()
+ {
+-shl_unload ();
++return shl_unload ();
+   ;
+   return 0;
+ }
+@@ -26808,14 +27445,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_shl_unload=no
++	ac_cv_lib_dld_shl_unload=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
+ if test $ac_cv_lib_dld_shl_unload = yes; then
+ 
+ LIBDL="-ldld"
+@@ -26829,8 +27467,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26841,12 +27479,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((size_t *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (size_t))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -26879,20 +27518,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_size_t=no
++	ac_cv_type_size_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of size_t" >&5
+-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of size_t" >&5
++echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_size_t" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -26905,10 +27545,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26946,10 +27587,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26983,30 +27625,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27044,10 +27688,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27081,23 +27726,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27109,10 +27757,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27146,26 +27795,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27173,8 +27816,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (size_t)); }
+-unsigned long ulongval () { return (long) (sizeof (size_t)); }
++		   typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27183,22 +27827,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (size_t))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -27222,29 +27866,28 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -27272,8 +26827,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=$?
-@@ -27335,8 +26889,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=$?
-@@ -27376,8 +26929,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=$?
-@@ -27433,8 +26985,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=$?
-@@ -27474,8 +27025,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=$?
-@@ -27539,8 +27089,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=$?
-@@ -27571,10 +27120,8 @@
+   ac_cv_sizeof_size_t=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+ 
+ 
+-  echo "$as_me:$LINENO: checking for unsigned long" >&5
+-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for unsigned long" >&5
++echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27255,12 +27898,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef unsigned long ac__type_new_;
+ int
+ main ()
+ {
+-if ((unsigned long *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (unsigned long))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -27293,20 +27937,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_unsigned_long=no
++	ac_cv_type_unsigned_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of unsigned long" >&5
+-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
++echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_unsigned_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -27319,10 +27964,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27360,10 +28006,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27397,30 +28044,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27458,10 +28107,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27495,23 +28145,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27523,10 +28176,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27560,26 +28214,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27587,8 +28235,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (unsigned long)); }
+-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
++		   typedef unsigned long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27597,22 +28246,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (unsigned long))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -27636,30 +28285,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
+   ac_cv_sizeof_unsigned_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
++echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27685,8 +27232,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27701,15 +28349,15 @@
    ac_status=$?
-@@ -27767,8 +27313,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=$?
-@@ -27868,8 +27413,7 @@
-   cat conftest.err >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       { { echo "$as_me:$LINENO: error:
+        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
+        does not apply. Please mail kde-devel at kde.org with a description of your system!
+@@ -27721,18 +28369,18 @@
+    { (exit 1); exit 1; }; }
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+-  echo "$as_me:$LINENO: checking for PIE support" >&5
+-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for PIE support" >&5
++echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
+ if test "${kde_cv_val_pie_support+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -27788,8 +28436,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_pie_support=no
++	kde_cv_val_pie_support=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -27803,26 +28452,26 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
++echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
++echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
+ 
+-  # Check whether --enable-pie or --disable-pie was given.
++  # Check whether --enable-pie was given.
+ if test "${enable_pie+set}" = set; then
+-  enableval="$enable_pie"
+-  kde_has_pie_support=$enableval
++  enableval=$enable_pie; kde_has_pie_support=$enableval
+ else
+   kde_has_pie_support=detect
+-fi;
++fi
++
+ 
+   if test "$kde_has_pie_support" = "detect"; then
+     kde_has_pie_support=$kde_cv_val_pie_support
+   fi
+ 
+-  echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+-echo "${ECHO_T}$kde_has_pie_support" >&6
++  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
++echo "${ECHO_T}$kde_has_pie_support" >&6; }
+ 
+   KDE_USE_FPIE=""
+   KDE_USE_PIE=""
+@@ -27841,18 +28490,19 @@
+ for ac_header in crt_externs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27889,15 +28539,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27931,9 +28582,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -27957,25 +28609,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -27987,8 +28633,8 @@
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
++echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28015,30 +28661,24 @@
+ 
+ #undef _NSGetEnviron
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char _NSGetEnviron ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
+ choke me
+-#else
+-char (*f) () = _NSGetEnviron;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != _NSGetEnviron;
++return _NSGetEnviron ();
+   ;
+   return 0;
+ }
+@@ -28070,13 +28710,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func__NSGetEnviron=no
++	ac_cv_func__NSGetEnviron=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
++echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
+ if test $ac_cv_func__NSGetEnviron = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -28097,9 +28738,9 @@
+ for ac_func in vsnprintf snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -28125,30 +28766,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -28180,13 +28815,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -28203,32 +28840,32 @@
+ 
+ 
+ 
+-# Check whether --enable-embedded or --disable-embedded was given.
++# Check whether --enable-embedded was given.
+ if test "${enable_embedded+set}" = set; then
+-  enableval="$enable_embedded"
+-  kde_use_qt_emb=$enableval
++  enableval=$enable_embedded; kde_use_qt_emb=$enableval
+ else
+   kde_use_qt_emb=no
+ 
+-fi;
++fi
++
+ 
+-# Check whether --enable-qtopia or --disable-qtopia was given.
++# Check whether --enable-qtopia was given.
+ if test "${enable_qtopia+set}" = set; then
+-  enableval="$enable_qtopia"
+-  kde_use_qt_emb_palm=$enableval
++  enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
+ else
+   kde_use_qt_emb_palm=no
+ 
+-fi;
++fi
++
+ 
+-# Check whether --enable-mac or --disable-mac was given.
++# Check whether --enable-mac was given.
+ if test "${enable_mac+set}" = set; then
+-  enableval="$enable_mac"
+-  kde_use_qt_mac=$enableval
++  enableval=$enable_mac; kde_use_qt_mac=$enableval
+ else
+   kde_use_qt_mac=no
+ 
+-fi;
++fi
++
+ 
+ # used to disable x11-specific stuff on special platforms
+ 
+@@ -28244,8 +28881,8 @@
+ 
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+ 
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+ 
+ if test "${kde_cv_have_x+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28350,6 +28987,7 @@
+     fi
+   done
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
+ 
+@@ -28407,7 +29045,7 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-LIBS="$ac_save_LIBS"
++	LIBS="$ac_save_LIBS"
+ # First see if replacing the include by lib works.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+@@ -28455,6 +29093,7 @@
+   done
+ done
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+@@ -28465,7 +29104,7 @@
+ *-*-solaris*)
+   ;;
+ *)
+-  rm -fr conftest.dir
++  rm -f -r conftest.dir
+ if mkdir conftest.dir; then
+   cd conftest.dir
+   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+@@ -28473,13 +29112,13 @@
+ acfindx:
+ 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+ _ACEOF
+-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+     eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+     for ac_extension in a so sl; do
+-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+-	 test -f $ac_im_libdir/libX11.$ac_extension; then
++      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
++	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ 	ac_im_usrlibdir=$ac_im_libdir; break
+       fi
+     done
+@@ -28487,7 +29126,7 @@
+     # bogus both because they are the default anyway, and because
+     # using them would break gcc on systems where it needs fixed includes.
+     case $ac_im_incroot in
+-	/usr/include) ;;
++	/usr/include) ac_x_includes= ;;
+ 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+     esac
+     case $ac_im_usrlibdir in
+@@ -28496,7 +29135,7 @@
+     esac
+   fi
+   cd ..
+-  rm -fr conftest.dir
++  rm -f -r conftest.dir
+ fi
+ 
+   if test -z "$ac_x_includes"; then
+@@ -28540,12 +29179,12 @@
+ eval "$kde_cv_have_x"
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
++  { echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6; }
+   no_x=yes
+ else
+-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
++echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+ fi
+ 
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -28573,8 +29212,8 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28587,17 +29226,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char IceConnectionNumber ();
+ int
+ main ()
+ {
+-IceConnectionNumber ();
++return IceConnectionNumber ();
+   ;
+   return 0;
+ }
+@@ -28629,14 +29268,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ICE_IceConnectionNumber=no
++	ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   LIBSM="-lSM -lICE"
+ fi
+@@ -28645,8 +29285,8 @@
+ 
+ LIB_X11='-lX11 $(LIBSOCKET)'
+ 
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libXext" >&5
++echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+ if test "${kde_cv_have_libXext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28706,9 +29346,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_have_libXext=no
++	kde_cv_have_libXext=no
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -28718,8 +29359,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
++echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
+ 
+ if test "$kde_cv_have_libXext" = "no"; then
+   { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -28865,8 +29506,8 @@
+     else
+       PTHREAD_LIBS_save="$PTHREAD_LIBS"
+       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+-      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
+ 
+      kde_save_LDFLAGS="$LDFLAGS"
+           kde_save_LIBS="$LIBS"
+@@ -28877,9 +29518,9 @@
+ 	;;
+      esac
+      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -28891,17 +29532,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+@@ -28933,14 +29574,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Lib=no"
++	eval "$as_ac_Lib=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -28953,8 +29596,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD"; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28967,17 +29610,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+@@ -29009,14 +29652,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pthread_pthread_create=no
++	ac_cv_lib_pthread_pthread_create=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+   LIBPTHREAD="-lpthread"
+ fi
+@@ -29024,8 +29668,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD" ; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+     kde_safe_libs=$LIBS
+     LIBS="$LIBS -lpthread"
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -29066,17 +29710,18 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -28049,8 +27593,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=$?
-@@ -28159,8 +27702,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=$?
-@@ -28384,8 +27926,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=$?
-@@ -28608,8 +28149,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=$?
-@@ -28685,8 +28225,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=$?
-@@ -28912,8 +28451,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=$?
-@@ -28988,8 +28526,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=$?
-@@ -29049,8 +28586,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=$?
-@@ -29133,8 +28669,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=$?
-@@ -29227,8 +28762,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=$?
-@@ -29402,8 +28936,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=$?
-@@ -29501,8 +29034,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=$?
-@@ -29589,8 +29121,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=$?
-@@ -29667,8 +29198,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=$?
-@@ -29721,7 +29251,7 @@
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         LIBPTHREAD="-lpthread"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS=$kde_safe_libs
+@@ -29092,16 +29737,15 @@
+       USE_THREADS=""
+       if test -z "$LIBPTHREAD"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
++echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -29154,7 +29798,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -29168,13 +29814,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-D_THREAD_SAFE -pthread"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29186,16 +29832,15 @@
+     case $host_os in
+  	solaris*)
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
++echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
+ kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -29248,7 +29893,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -29262,13 +29909,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-mt"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29295,17 +29942,17 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for extra includes" >&5
+-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra includes" >&5
++echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
+ 
+-# Check whether --with-extra-includes or --without-extra-includes was given.
++# Check whether --with-extra-includes was given.
+ if test "${with_extra_includes+set}" = set; then
+-  withval="$with_extra_includes"
+-  kde_use_extra_includes="$withval"
++  withval=$with_extra_includes; kde_use_extra_includes="$withval"
+ else
+   kde_use_extra_includes=NONE
+ 
+-fi;
++fi
++
+ kde_extra_includes=
+ if test -n "$kde_use_extra_includes" && \
+    test "$kde_use_extra_includes" != "NONE"; then
+@@ -29323,21 +29970,21 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+-echo "${ECHO_T}$kde_use_extra_includes" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
++echo "${ECHO_T}$kde_use_extra_includes" >&6; }
+ 
+ kde_extra_libs=
+-echo "$as_me:$LINENO: checking for extra libs" >&5
+-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra libs" >&5
++echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
+ 
+-# Check whether --with-extra-libs or --without-extra-libs was given.
++# Check whether --with-extra-libs was given.
+ if test "${with_extra_libs+set}" = set; then
+-  withval="$with_extra_libs"
+-  kde_use_extra_libs=$withval
++  withval=$with_extra_libs; kde_use_extra_libs=$withval
+ else
+   kde_use_extra_libs=NONE
+ 
+-fi;
++fi
++
+ if test -n "$kde_use_extra_libs" && \
+    test "$kde_use_extra_libs" != "NONE"; then
+ 
+@@ -29356,14 +30003,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+-echo "${ECHO_T}$kde_use_extra_libs" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
++echo "${ECHO_T}$kde_use_extra_libs" >&6; }
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libz" >&5
+-echo $ECHO_N "checking for libz... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libz" >&5
++echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_z+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29423,8 +30070,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_z=no"
++	eval "ac_cv_lib_z=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29438,8 +30086,8 @@
+ _ACEOF
+ 
+   LIBZ="$ac_cv_lib_z"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+-echo "${ECHO_T}$ac_cv_lib_z" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
++echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: not found.
+           Possibly configure picks up an outdated version
+@@ -29459,8 +30107,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libpng" >&5
+-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libpng" >&5
++echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29522,9 +30170,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_png=no"
++	eval "ac_cv_lib_png=no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29539,19 +30188,19 @@
+ 
+   LIBPNG="$ac_cv_lib_png"
+ 
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+-echo "${ECHO_T}$ac_cv_lib_png" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
++echo "${ECHO_T}$ac_cv_lib_png" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   LIBPNG=""
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
++echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29610,8 +30259,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_6b=no"
++	eval "ac_cv_lib_jpeg_6b=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29622,14 +30272,14 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_6b"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for libjpeg" >&5
+-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg" >&5
++echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29688,8 +30338,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_normal=no"
++	eval "ac_cv_lib_jpeg_normal=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29700,11 +30351,11 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_normal"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+        LIBJPEG=
+ 
+@@ -29724,7 +30375,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29724: $i/$j" >&5
-+    echo "configure: 29254: $i/$j" >&5
+-    echo "configure: 29727: $i/$j" >&5
++    echo "configure: 30378: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -30019,7 +29549,7 @@
+@@ -29771,14 +30422,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for perl" >&5
+-echo $ECHO_N "checking for perl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for perl" >&5
++echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
+    if test -n "$PERL"; then
+         kde_cv_path="$PERL";
+    else
+         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -29821,8 +30472,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+ 		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+ We need perl to generate some code." >&5
+@@ -29831,8 +30482,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       PERL=$kde_cv_path
+ 
+    fi
+@@ -29846,10 +30497,9 @@
+ 
+ 
+ 
+-# Check whether --enable-mt or --disable-mt was given.
++# Check whether --enable-mt was given.
+ if test "${enable_mt+set}" = set; then
+-  enableval="$enable_mt"
+-  kde_use_qt_mt=$enableval
++  enableval=$enable_mt; kde_use_qt_mt=$enableval
+ else
+ 
+     if test $kde_qtver = 3; then
+@@ -29859,7 +30509,8 @@
+     fi
+ 
+ 
+-fi;
++fi
++
+ 
+ USING_QT_MT=""
+ 
+@@ -29879,13 +30530,13 @@
+   else
+     kde_check_threading_default=yes
+   fi
+-  # Check whether --enable-threading or --disable-threading was given.
++  # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
+-  enableval="$enable_threading"
+-  kde_use_threading=$enableval
++  enableval=$enable_threading; kde_use_threading=$enableval
+ else
+   kde_use_threading=$kde_check_threading_default
+-fi;
++fi
++
+   if test "x$kde_use_threading" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -29957,8 +30608,8 @@
+   LIBQT="$LIBQT $LIBDL"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for Qt" >&5
+-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt" >&5
++echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
+ 
+ if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+ LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
+@@ -29967,34 +30618,34 @@
+ qt_libraries=""
+ qt_includes=""
+ 
+-# Check whether --with-qt-dir or --without-qt-dir was given.
++# Check whether --with-qt-dir was given.
+ if test "${with_qt_dir+set}" = set; then
+-  withval="$with_qt_dir"
+-    ac_qt_includes="$withval"/include
++  withval=$with_qt_dir;   ac_qt_includes="$withval"/include
+        ac_qt_libraries="$withval"/lib${kdelibsuff}
+        ac_qt_bindir="$withval"/bin
+ 
+-fi;
++fi
+ 
+ 
+-# Check whether --with-qt-includes or --without-qt-includes was given.
+-if test "${with_qt_includes+set}" = set; then
+-  withval="$with_qt_includes"
+ 
++# Check whether --with-qt-includes was given.
++if test "${with_qt_includes+set}" = set; then
++  withval=$with_qt_includes;
+        ac_qt_includes="$withval"
+ 
+-fi;
++fi
++
+ 
+ kde_qt_libs_given=no
+ 
+ 
+-# Check whether --with-qt-libraries or --without-qt-libraries was given.
++# Check whether --with-qt-libraries was given.
+ if test "${with_qt_libraries+set}" = set; then
+-  withval="$with_qt_libraries"
+-    ac_qt_libraries="$withval"
++  withval=$with_qt_libraries;   ac_qt_libraries="$withval"
+        kde_qt_libs_given=yes
+ 
+-fi;
++fi
++
+ 
+ if test "${ac_cv_have_qt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -30022,7 +30673,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 30022: $i/$j" >&5
-+    echo "configure: 29552: $i/$j" >&5
+-    echo "configure: 30025: $i/$j" >&5
++    echo "configure: 30676: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30696,8 +30226,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=$?
-@@ -30856,7 +30385,7 @@
+@@ -30059,8 +30710,7 @@
+ ac_qt_libraries="$qt_libdir"
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30197,13 +30847,13 @@
+ eval "$ac_cv_have_qt"
+ 
+ if test "$have_qt" != yes; then
+-  echo "$as_me:$LINENO: result: $have_qt" >&5
+-echo "${ECHO_T}$have_qt" >&6;
++  { echo "$as_me:$LINENO: result: $have_qt" >&5
++echo "${ECHO_T}$have_qt" >&6; };
+ else
+   ac_cv_have_qt="have_qt=yes \
+     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
++echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
+ 
+   qt_libraries="$ac_qt_libraries"
+   qt_includes="$ac_qt_includes"
+@@ -30212,15 +30862,14 @@
+ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
+ 
+ 
+-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
++echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_direct+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30341,12 +30990,12 @@
+ 
+ 
+ if test "$kde_cv_qt_direct" = "yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   qt_libraries=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -30384,14 +31033,14 @@
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for moc" >&5
+-echo $ECHO_N "checking for moc... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for moc" >&5
++echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
+    if test -n "$MOC"; then
+         kde_cv_path="$MOC";
+    else
+         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30434,8 +31083,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+ Please check whether you installed Qt correctly.
+@@ -30456,22 +31105,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MOC=$kde_cv_path
+ 
+    fi
+ 
+    if test -z "$UIC_NOT_NEEDED"; then
+ 
+-   echo "$as_me:$LINENO: checking for uic" >&5
+-echo $ECHO_N "checking for uic... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for uic" >&5
++echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
+    if test -n "$UIC_PATH"; then
+         kde_cv_path="$UIC_PATH";
+    else
+         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30514,12 +31163,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       UIC_PATH=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       UIC_PATH=$kde_cv_path
+ 
+    fi
+@@ -30549,10 +31198,10 @@
+ 
+        if test $kde_qtver = 3; then
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
++echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
+     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30575,22 +31224,22 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         :
+         ac_uic_supports_libpath=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         :
+         ac_uic_supports_libpath=no
+     fi
+ 
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
++echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
+     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30613,13 +31262,13 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         :
+         ac_uic_supports_nounload=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         :
+         ac_uic_supports_nounload=no
+     fi
+@@ -30650,15 +31299,14 @@
+ 
+ 
+ if test -n "$LIBJPEG"; then
+-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
++echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_jpeg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30717,8 +31365,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "kde_cv_qt_jpeg=yes"
++	eval "kde_cv_qt_jpeg=yes"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -30735,12 +31384,12 @@
+ 
+ 
+ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   LIBJPEG_QT='$(LIBJPEG)'
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   LIBJPEG_QT=
+ fi
+ 
+@@ -30771,15 +31420,15 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for rpath" >&5
+-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
+-# Check whether --enable-rpath or --disable-rpath was given.
++{ echo "$as_me:$LINENO: checking for rpath" >&5
++echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
++# Check whether --enable-rpath was given.
+ if test "${enable_rpath+set}" = set; then
+-  enableval="$enable_rpath"
+-  USE_RPATH=$enableval
++  enableval=$enable_rpath; USE_RPATH=$enableval
+ else
+   USE_RPATH=yes
+-fi;
++fi
++
+ 
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+ 
+@@ -30803,11 +31452,11 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+-echo "${ECHO_T}$USE_RPATH" >&6
++{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
++echo "${ECHO_T}$USE_RPATH" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for KDE" >&5
+-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE" >&5
++echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
+ 
+ if test "${prefix}" != NONE; then
+   kde_includes=${includedir}
+@@ -30859,7 +31508,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30859: $i/$j" >&5
-+    echo "configure: 30388: $i/$j" >&5
+-    echo "configure: 30862: $i/$j" >&5
++    echo "configure: 31511: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30886,7 +30415,7 @@
+@@ -30889,7 +31538,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30889: $i/$j" >&5
-+    echo "configure: 30418: $i/$j" >&5
+-    echo "configure: 30892: $i/$j" >&5
++    echo "configure: 31541: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30904,7 +30433,7 @@
+@@ -30907,7 +31556,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30907: $i/$j" >&5
-+    echo "configure: 30436: $i/$j" >&5
+-    echo "configure: 30910: $i/$j" >&5
++    echo "configure: 31559: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32427,7 +31956,7 @@
- do
-   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
-   do
--    echo "configure: 32430: $i/$j" >&5
-+    echo "configure: 31959: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       KDE_XSL_STYLESHEET=$i
-@@ -32685,8 +32214,7 @@
-   cat conftest.err >&5
+@@ -30966,12 +31615,12 @@
+  fi
+  if test "$exec_prefix" = NONE; then
+   ac_kde_exec_prefix="$ac_kde_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
++  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
+  else
+   ac_kde_exec_prefix="$exec_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
++  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+  fi
+ 
+  kde_libraries="${libdir}"
+@@ -30980,8 +31629,8 @@
+ else
+   ac_cv_have_kde="have_kde=yes \
+     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
++echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
+ 
+   kde_libraries="$ac_kde_libraries"
+   kde_includes="$ac_kde_includes"
+@@ -31019,8 +31668,8 @@
+ 
+ if test x$ac_uic_supports_libpath = xyes; then
+ 
+-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
++echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
+ if test "${kde_cv_uic_plugins+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31063,8 +31712,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
++echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
+ if test "$kde_cv_uic_plugins" != yes; then
+ 	{ { echo "$as_me:$LINENO: error:
+ you need to install kdelibs first.
+@@ -31096,10 +31745,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-path-check or --disable-path-check was given.
++  # Check whether --enable-path-check was given.
+ if test "${enable_path_check+set}" = set; then
+-  enableval="$enable_path_check"
+-
++  enableval=$enable_path_check;
+   if test "$enableval" = "no";
+     then ac_use_path_checking="default"
+     else ac_use_path_checking=""
+@@ -31113,13 +31761,14 @@
+   fi
+ 
+ 
+-fi;
++fi
++
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for KDE paths" >&5
+-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE paths" >&5
++echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
+ kde_result=""
+ kde_cached_paths=yes
+ if test "${kde_cv_all_paths+set}" = set; then
+@@ -31230,15 +31879,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
++     { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+ 
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -31290,8 +31938,8 @@
+   ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  else
+    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31330,8 +31978,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ 
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31339,8 +31987,8 @@
    ac_status=$?
-@@ -32781,8 +32309,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31533,15 +32181,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
+-
++     { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+ 
++    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+ 
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -31593,8 +32240,8 @@
    ac_status=$?
-@@ -32875,8 +32402,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  else
+    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31633,8 +32280,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ 
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31642,8 +32289,8 @@
    ac_status=$?
-@@ -32948,7 +32474,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31735,22 +32382,22 @@
+    { (exit 1); exit 1; }; }
+ else
+   rm -f conftest*
+-  echo "$as_me:$LINENO: result: $kde_result" >&5
+-echo "${ECHO_T}$kde_result" >&6
++  { echo "$as_me:$LINENO: result: $kde_result" >&5
++echo "${ECHO_T}$kde_result" >&6; }
+ fi
+ 
+ bindir=$kde_bindir
+ 
+ 
+ 
+-# Check whether --with-arts or --without-arts was given.
++# Check whether --with-arts was given.
+ if test "${with_arts+set}" = set; then
+-  withval="$with_arts"
+-  build_arts=$withval
++  withval=$with_arts; build_arts=$withval
+ else
+   build_arts=yes
+ 
+-fi;
++fi
++
+ 
+ 
+ if test "$build_arts" '!=' "no"; then
+@@ -31783,14 +32430,14 @@
+ 
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl" >&5
+-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidl" >&5
++echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
+    if test -n "$DCOPIDL"; then
+         kde_cv_path="$DCOPIDL";
+    else
+         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31833,8 +32480,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+ Please check whether you installed KDE correctly.
+@@ -31845,21 +32492,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
++echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
+    if test -n "$DCOPIDL2CPP"; then
+         kde_cv_path="$DCOPIDL2CPP";
+    else
+         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31902,8 +32549,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+ Please check whether you installed KDE correctly.
+@@ -31914,22 +32561,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDL2CPP=$kde_cv_path
+ 
+    fi
+ 
+         if test "$build_arts" '!=' "no"; then
+ 
+-   echo "$as_me:$LINENO: checking for mcopidl" >&5
+-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for mcopidl" >&5
++echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
+    if test -n "$MCOPIDL"; then
+         kde_cv_path="$MCOPIDL";
+    else
+         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31972,8 +32619,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+ Please check whether you installed aRts correctly or use
+@@ -31986,21 +32633,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for artsc-config" >&5
++echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
+    if test -n "$ARTSCCONFIG"; then
+         kde_cv_path="$ARTSCCONFIG";
+    else
+         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32043,8 +32690,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+ Please check whether you installed aRts correctly or use
+@@ -32057,22 +32704,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       ARTSCCONFIG=$kde_cv_path
+ 
+    fi
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for meinproc" >&5
+-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for meinproc" >&5
++echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
+    if test -n "$MEINPROC"; then
+         kde_cv_path="$MEINPROC";
+    else
+         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32115,12 +32762,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MEINPROC=$kde_cv_path
+ 
+    fi
+@@ -32149,14 +32796,14 @@
+ 
+         if test -n "$kde32ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
++echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+    if test -n "$KCONFIG_COMPILER"; then
+         kde_cv_path="$KCONFIG_COMPILER";
+    else
+         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32199,8 +32846,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+ Please check whether you installed KDE correctly.
+@@ -32211,21 +32858,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KCONFIG_COMPILER=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidlng" >&5
+-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
++echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
+    if test -n "$DCOPIDLNG"; then
+         kde_cv_path="$DCOPIDLNG";
+    else
+         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32268,8 +32915,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+ Please check whether you installed KDE correctly.
+@@ -32280,8 +32927,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDLNG=$kde_cv_path
+ 
+    fi
+@@ -32289,14 +32936,14 @@
+         fi
+         if test -n "$kde33ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
++echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
+    if test -n "$MAKEKDEWIDGETS"; then
+         kde_cv_path="$MAKEKDEWIDGETS";
+    else
+         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32339,8 +32986,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+ Please check whether you installed KDE correctly.
+@@ -32351,8 +32998,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MAKEKDEWIDGETS=$kde_cv_path
+ 
+    fi
+@@ -32360,14 +33007,14 @@
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+    if test -n "$XMLLINT"; then
+         kde_cv_path="$XMLLINT";
+    else
+         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32410,12 +33057,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       XMLLINT=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       XMLLINT=$kde_cv_path
+ 
+    fi
+@@ -32430,7 +33077,7 @@
  do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 32433: $i/$j" >&5
++    echo "configure: 33080: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -32591,13 +33238,12 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
++echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
+ 
+   if test "x$GXX" = "xyes"; then
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32618,13 +33264,13 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "GCC visibility push" >/dev/null 2>&1; then
+ 
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       kde_stdc_visibility_patched=yes
+ else
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+                    visibility support. Disabling -fvisibility=hidden" >&5
+ echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+@@ -32644,16 +33290,15 @@
+ 
+     kde_have_gcc_visibility=no
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
++echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
+ kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32706,7 +33351,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -32720,28 +33367,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       kde_have_gcc_visibility=yes
+-                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
++                              # Check whether --enable-gcc-hidden-visibility was given.
+ if test "${enable_gcc_hidden_visibility+set}" = set; then
+-  enableval="$enable_gcc_hidden_visibility"
+-  kde_have_gcc_visibility=$enableval
++  enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
+ else
+   kde_have_gcc_visibility=no
+-fi;
++fi
++
+ 
+-      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
++echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
+ if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-           ac_ext=cc
++           ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32802,8 +33448,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_qt_gcc_visibility_patched=yes
++	kde_cv_val_qt_gcc_visibility_patched=yes
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+           CXXFLAGS=$safe_CXXFLAGS
+@@ -32816,21 +33463,20 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
++echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
+ 
+       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ 
+-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
++echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
+ if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-         ac_ext=cc
++         ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -32896,8 +33542,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_gcc_visibility_bug=yes
++	kde_cv_val_gcc_visibility_bug=yes
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -32912,8 +33559,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
++echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
+ 
+     if test x$kde_cv_val_gcc_visibility_bug = xno; then
+       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+@@ -32929,8 +33576,8 @@
+       fi
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -32938,8 +33585,8 @@
+   fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for Qt docs" >&5
+-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt docs" >&5
++echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
+ kde_qtdir=
+ if test "${with_qt_dir+set}" = set; then
+   kde_qtdir="$with_qt_dir"
+@@ -32951,7 +33598,7 @@
+ do
    for j in qsql.html;
    do
--    echo "configure: 32951: $i/$j" >&5
-+    echo "configure: 32477: $i/$j" >&5
+-    echo "configure: 32954: $i/$j" >&5
++    echo "configure: 33601: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -33141,8 +32667,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
+@@ -32960,20 +33607,20 @@
+   done
+ done
+ 
+-echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+-echo "${ECHO_T}$QTDOCDIR" >&6
++{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
++echo "${ECHO_T}$QTDOCDIR" >&6; }
+ 
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dot" >&5
+-echo $ECHO_N "checking for dot... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dot" >&5
++echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
+    if test -n "$DOT"; then
+         kde_cv_path="$DOT";
+    else
+         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -33016,12 +33663,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DOT=$kde_cv_path
+ 
+    fi
+@@ -33033,14 +33680,14 @@
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for doxygen" >&5
+-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for doxygen" >&5
++echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
+    if test -n "$DOXYGEN"; then
+         kde_cv_path="$DOXYGEN";
+    else
+         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -33083,12 +33730,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DOXYGEN=$kde_cv_path
+ 
+    fi
+@@ -33114,18 +33761,19 @@
+ for ac_header in linux/tcp.h linux/if_ppp.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33162,15 +33810,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33204,9 +33853,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33230,25 +33880,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33265,18 +33909,19 @@
+ for ac_header in net/errno.h net/if_ppp.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33313,15 +33958,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33355,9 +34001,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33381,25 +34028,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33415,18 +34056,19 @@
+ for ac_header in asm/param.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33463,15 +34105,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33505,9 +34148,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33531,25 +34175,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33569,18 +34207,19 @@
+ for ac_header in sys/file.h sys/stat.h sys/time.h sys/cdefs.h sys/sockio.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33617,15 +34256,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33659,9 +34299,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33685,25 +34326,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33724,18 +34359,19 @@
+ for ac_header in fcntl.h unistd.h fnmatch.h sysent.h strings.h paths.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33772,15 +34408,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33814,9 +34451,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33840,25 +34478,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33877,18 +34509,19 @@
+ for ac_header in utmp.h re_comp.h getopt.h byteswap.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33925,15 +34558,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33967,9 +34601,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33993,25 +34628,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -34023,8 +34652,8 @@
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for resolv.h" >&5
+-echo $ECHO_N "checking for resolv.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for resolv.h" >&5
++echo $ECHO_N "checking for resolv.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_resolv_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34065,25 +34694,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_resolv_h=no
++	ac_cv_header_resolv_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5
+-echo "${ECHO_T}$ac_cv_header_resolv_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_resolv_h" >&5
++echo "${ECHO_T}$ac_cv_header_resolv_h" >&6; }
+ 
+ 
+ 
+ 
+-# Check whether --enable-largefile or --disable-largefile was given.
++# Check whether --enable-largefile was given.
+ if test "${enable_largefile+set}" = set; then
+-  enableval="$enable_largefile"
++  enableval=$enable_largefile;
++fi
+ 
+-fi;
+ if test "$enable_largefile" != no; then
+ 
+-  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34091,8 +34721,8 @@
+      if test "$GCC" != yes; then
+        ac_save_CC=$CC
+        while :; do
+-     	 # IRIX 6.2 and later do not support large files by default,
+-     	 # so use the C compiler's -n32 option if that helps.
++	 # IRIX 6.2 and later do not support large files by default,
++	 # so use the C compiler's -n32 option if that helps.
+ 	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34116,7 +34746,7 @@
+   return 0;
+ }
+ _ACEOF
+-     	 rm -f conftest.$ac_objext
++	 rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -33292,8 +32817,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
+@@ -34143,10 +34773,12 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext
+-     	 CC="$CC -n32"
+-     	 rm -f conftest.$ac_objext
++	 CC="$CC -n32"
++	 rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -33442,8 +32966,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=$?
-@@ -33596,8 +33119,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=$?
-@@ -33751,8 +33273,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=$?
-@@ -33904,8 +33425,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=$?
-@@ -34044,8 +33564,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=$?
-@@ -34122,8 +33641,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=$?
-@@ -34152,8 +33670,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=$?
-@@ -34223,8 +33740,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=$?
-@@ -34276,8 +33792,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=$?
-@@ -34348,8 +33863,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=$?
-@@ -34401,8 +33915,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=$?
-@@ -34513,8 +34026,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=$?
-@@ -34568,9 +34080,6 @@
+@@ -34173,7 +34805,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext
+ 	 break
+        done
+@@ -34181,14 +34815,14 @@
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34244,7 +34878,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -34297,13 +34933,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   break
+ done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+ if test "$ac_cv_sys_file_offset_bits" != no; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -34312,8 +34950,8 @@
+ 
+ fi
+ rm -f conftest*
+-  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+ if test "${ac_cv_sys_large_files+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34369,7 +35007,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -34422,13 +35062,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   break
+ done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
++echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+ if test "$ac_cv_sys_large_files" != no; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -34451,9 +35093,9 @@
+ for ac_func in flock
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34479,30 +35121,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -34534,13 +35170,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -34551,15 +35189,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for usleep" >&5
+-echo $ECHO_N "checking for usleep... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for usleep" >&5
++echo $ECHO_N "checking for usleep... $ECHO_C" >&6; }
+ if test "${kde_cv_func_usleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -34571,9 +35208,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16018,37 +29119,154 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34603,8 +34112,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=$?
-@@ -34707,8 +34215,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=$?
-@@ -34839,8 +34346,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=$?
-@@ -34894,9 +34400,6 @@
+@@ -34624,8 +35258,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_usleep=no
++	kde_cv_func_usleep=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -34639,11 +35274,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
+-echo "${ECHO_T}$kde_cv_func_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
++echo "${ECHO_T}$kde_cv_func_usleep" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
+-echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
++echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_usleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34664,8 +35299,7 @@
+ if test "x$kde_cv_proto_usleep" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -34729,9 +35363,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_usleep="usleep unavailable"
++	kde_cv_proto_usleep="usleep unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -34745,8 +35380,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
+-echo "${ECHO_T}$kde_cv_proto_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
++echo "${ECHO_T}$kde_cv_proto_usleep" >&6; }
+ 
+ if test "x$kde_cv_func_usleep" = xyes; then
+ 
+@@ -34777,9 +35412,9 @@
+ for ac_func in socket fabsl strdup vsnprintf tzset
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34805,30 +35440,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -34860,13 +35489,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -34877,15 +35508,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for setenv" >&5
+-echo $ECHO_N "checking for setenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for setenv" >&5
++echo $ECHO_N "checking for setenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_setenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -34897,9 +35527,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16058,27 +29276,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34927,8 +34430,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=$?
-@@ -35029,8 +34531,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=$?
-@@ -35109,9 +34610,6 @@
+@@ -34948,8 +35575,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_setenv=no
++	kde_cv_func_setenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -34963,11 +35591,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
+-echo "${ECHO_T}$kde_cv_func_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
++echo "${ECHO_T}$kde_cv_func_setenv" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
+-echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
++echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_setenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34988,8 +35616,7 @@
+ if test "x$kde_cv_proto_setenv" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35051,9 +35678,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_setenv="setenv unavailable"
++	kde_cv_proto_setenv="setenv unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -35067,8 +35695,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
++echo "${ECHO_T}$kde_cv_proto_setenv" >&6; }
+ 
+ if test "x$kde_cv_func_setenv" = xyes; then
+ 
+@@ -35092,15 +35720,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for unsetenv" >&5
+-echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for unsetenv" >&5
++echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_unsetenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35112,9 +35739,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16088,27 +29365,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35142,8 +34640,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=$?
-@@ -35244,8 +34741,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=$?
-@@ -35324,9 +34820,6 @@
+@@ -35163,8 +35787,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_unsetenv=no
++	kde_cv_func_unsetenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -35178,11 +35803,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_func_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_func_unsetenv" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
+-echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
++echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_unsetenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35203,8 +35828,7 @@
+ if test "x$kde_cv_proto_unsetenv" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35266,9 +35890,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_unsetenv="unsetenv unavailable"
++	kde_cv_proto_unsetenv="unsetenv unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -35282,8 +35907,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6; }
+ 
+ if test "x$kde_cv_func_unsetenv" = xyes; then
+ 
+@@ -35307,15 +35932,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for getdomainname" >&5
+-echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for getdomainname" >&5
++echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6; }
+ if test "${kde_cv_func_getdomainname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35327,9 +35951,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16118,27 +29454,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35362,8 +34855,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=$?
-@@ -35470,8 +34962,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=$?
-@@ -35550,9 +35041,6 @@
+@@ -35383,8 +36004,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_getdomainname=no
++	kde_cv_func_getdomainname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -35398,11 +36020,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5
+-echo "${ECHO_T}$kde_cv_func_getdomainname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5
++echo "${ECHO_T}$kde_cv_func_getdomainname" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5
+-echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5
++echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_getdomainname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35423,8 +36045,7 @@
+ if test "x$kde_cv_proto_getdomainname" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35492,9 +36113,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_getdomainname="getdomainname unavailable"
++	kde_cv_proto_getdomainname="getdomainname unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -35508,8 +36130,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5
+-echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5
++echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6; }
+ 
+ if test "x$kde_cv_func_getdomainname" = xyes; then
+ 
+@@ -35533,15 +36155,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for gethostname" >&5
+-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for gethostname" >&5
++echo $ECHO_N "checking for gethostname... $ECHO_C" >&6; }
+ if test "${kde_cv_func_gethostname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35553,9 +36174,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16148,528 +29543,2549 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35587,8 +35075,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=$?
-@@ -35693,8 +35180,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=$?
-@@ -35786,8 +35272,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=$?
-@@ -35829,8 +35314,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=$?
-@@ -35887,8 +35371,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=$?
-@@ -36047,8 +35530,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=$?
-@@ -36112,8 +35594,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=$?
-@@ -36178,8 +35659,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=$?
-@@ -36243,8 +35723,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=$?
-@@ -36320,8 +35799,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=$?
-@@ -36469,8 +35947,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=$?
-@@ -36547,7 +36024,7 @@
+@@ -35608,8 +36226,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_gethostname=no
++	kde_cv_func_gethostname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -35623,11 +36242,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
+-echo "${ECHO_T}$kde_cv_func_gethostname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
++echo "${ECHO_T}$kde_cv_func_gethostname" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
+-echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
++echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_gethostname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35648,8 +36267,7 @@
+ if test "x$kde_cv_proto_gethostname" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35715,9 +36333,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_gethostname="gethostname unavailable"
++	kde_cv_proto_gethostname="gethostname unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -35731,8 +36350,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
+-echo "${ECHO_T}$kde_cv_proto_gethostname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
++echo "${ECHO_T}$kde_cv_proto_gethostname" >&6; }
+ 
+ if test "x$kde_cv_func_gethostname" = xyes; then
+ 
+@@ -35754,8 +36373,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35850,14 +36469,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_bigendian=no
++	ac_cv_c_bigendian=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# It does not; compile a test program.
++	# It does not; compile a test program.
+ if test "$cross_compiling" = yes; then
+   # try to guess the endianness by grepping values into an object file
+   ac_cv_c_bigendian=unknown
+@@ -35867,11 +36487,11 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ int
+ main ()
+@@ -35918,7 +36538,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35927,17 +36549,22 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++$ac_includes_default
+ int
+ main ()
+ {
++
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+-    long l;
+-    char c[sizeof (long)];
++    long int l;
++    char c[sizeof (long int)];
+   } u;
+   u.l = 1;
+-  exit (u.c[sizeof (long) - 1] == 1);
++  return u.c[sizeof (long int) - 1] == 1;
++
++  ;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -35960,13 +36587,16 @@
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in
+   yes)
+ 
+@@ -35985,8 +36615,8 @@
+ esac
+ 
+ 
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${ac_cv_func_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36013,30 +36643,24 @@
+ 
+ #undef res_init
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char res_init ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_res_init) || defined (__stub___res_init)
++#if defined __stub_res_init || defined __stub___res_init
+ choke me
+-#else
+-char (*f) () = res_init;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != res_init;
++return res_init ();
+   ;
+   return 0;
+ }
+@@ -36068,17 +36692,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_res_init=no
++	ac_cv_func_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
+-echo "${ECHO_T}$ac_cv_func_res_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
++echo "${ECHO_T}$ac_cv_func_res_init" >&6; }
+ 
+ if test "$ac_cv_func_res_init" = no; then
+-  echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5
+-echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5
++echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_resolv_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36091,17 +36716,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char res_init ();
+ int
+ main ()
+ {
+-res_init ();
++return res_init ();
+   ;
+   return 0;
+ }
+@@ -36133,14 +36758,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_resolv_res_init=no
++	ac_cv_lib_resolv_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6; }
+ if test $ac_cv_lib_resolv_res_init = yes; then
+   LIBRESOLV="-lresolv $LIBSOCKET"
+ fi
+@@ -36148,8 +36774,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for timezone variable" >&5
+-echo $ECHO_N "checking for timezone variable... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for timezone variable" >&5
++echo $ECHO_N "checking for timezone variable... $ECHO_C" >&6; }
+ if test "${ac_cv_var_timezone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36199,12 +36825,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_var_timezone=no
++	ac_cv_var_timezone=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_var_timezone" >&5
+-echo "${ECHO_T}$ac_cv_var_timezone" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_var_timezone" >&5
++echo "${ECHO_T}$ac_cv_var_timezone" >&6; }
+ if test $ac_cv_var_timezone = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36212,8 +36839,8 @@
+ _ACEOF
+ 
+ fi
+-echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
++echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
+ if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36264,12 +36891,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_struct_tm_gmtoff=no
++	ac_cv_struct_tm_gmtoff=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
+-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
++echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6; }
+ if test $ac_cv_struct_tm_gmtoff = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36279,16 +36907,16 @@
+ fi
+ 
+ # check for SLP
+-# Check whether --enable-slp or --disable-slp was given.
++# Check whether --enable-slp was given.
+ if test "${enable_slp+set}" = set; then
+-  enableval="$enable_slp"
+-  with_slp=$enableval
++  enableval=$enable_slp; with_slp=$enableval
+ else
+   with_slp=yes
+-fi;
++fi
++
+ if test "$with_slp" = "yes"; then
+-echo "$as_me:$LINENO: checking for SLP support" >&5
+-echo $ECHO_N "checking for SLP support... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for SLP support" >&5
++echo $ECHO_N "checking for SLP support... $ECHO_C" >&6; }
+ save_slptest_LIBS="$LIBS"
+ save_slptest_LDFLAGS="$LDFLAGS"
+ save_slptest_CPPFLAGS="$CPPFLAGS"
+@@ -36343,19 +36971,20 @@
+ _ACEOF
+ 
+                         LIB_SLP="-lslp"
+-			echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++			{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-			echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++			{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+                         LIB_SLP=""
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$save_slptest_CPPFLAGS
+@@ -36376,13 +37005,13 @@
+   else
+     kde_check_threading_default=yes
+   fi
+-  # Check whether --enable-threading or --disable-threading was given.
++  # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
+-  enableval="$enable_threading"
+-  kde_use_threading=$enableval
++  enableval=$enable_threading; kde_use_threading=$enableval
+ else
+   kde_use_threading=$kde_check_threading_default
+-fi;
++fi
++
+   if test "x$kde_use_threading" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36407,28 +37036,27 @@
+  test -z "$GL_INCLUDE" && GL_INCLUDE=
+ 
+ 
+-# Check whether --with-gl or --without-gl was given.
++# Check whether --with-gl was given.
+ if test "${with_gl+set}" = set; then
+-  withval="$with_gl"
+-  gl_test=$withval
++  withval=$with_gl; gl_test=$withval
+ else
+   gl_test="yes"
+-fi;
++fi
++
+  if test "x$kde_use_qt_emb" = "xyes"; then
+    # GL and Qt Embedded is a no-go for now.
+    ac_cv_have_gl=no
+  elif test "x$gl_test" = xno; then
+    ac_cv_have_gl=no
+  else
+-   echo "$as_me:$LINENO: checking for GL" >&5
+-echo $ECHO_N "checking for GL... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for GL" >&5
++echo $ECHO_N "checking for GL... $ECHO_C" >&6; }
+    if test "${ac_cv_have_gl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -36490,8 +37118,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_gl="no"
++	ac_cv_have_gl="no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+@@ -36507,8 +37136,8 @@
+ fi
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     GL_LDFLAGS=""
+     GLINC=""
+ 
+@@ -36528,8 +37157,8 @@
+     else
+        GLINC="-I$GL_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
++    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6; }
+ 
+   fi
+  fi
+@@ -36537,8 +37166,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for Qt docs" >&5
+-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt docs" >&5
++echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
+ kde_qtdir=
+ if test "${with_qt_dir+set}" = set; then
+   kde_qtdir="$with_qt_dir"
+@@ -36550,7 +37179,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 36550: $i/$j" >&5
-+    echo "configure: 36027: $i/$j" >&5
+-    echo "configure: 36553: $i/$j" >&5
++    echo "configure: 37182: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -36737,8 +36214,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=$?
-@@ -36819,8 +36295,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=$?
-@@ -37278,8 +36753,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=$?
-@@ -37349,8 +36823,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=$?
-@@ -37412,8 +36885,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=$?
-@@ -37453,8 +36925,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=$?
-@@ -37510,8 +36981,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=$?
-@@ -37551,8 +37021,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=$?
-@@ -37616,8 +37085,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=$?
-@@ -37648,10 +37116,8 @@
+@@ -36559,20 +37188,20 @@
+   done
+ done
+ 
+-echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+-echo "${ECHO_T}$QTDOCDIR" >&6
++{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
++echo "${ECHO_T}$QTDOCDIR" >&6; }
+ 
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dot" >&5
+-echo $ECHO_N "checking for dot... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dot" >&5
++echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
+    if test -n "$DOT"; then
+         kde_cv_path="$DOT";
+    else
+         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -36615,12 +37244,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DOT=$kde_cv_path
+ 
+    fi
+@@ -36632,14 +37261,14 @@
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for doxygen" >&5
+-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for doxygen" >&5
++echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
+    if test -n "$DOXYGEN"; then
+         kde_cv_path="$DOXYGEN";
+    else
+         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -36682,12 +37311,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DOXYGEN=$kde_cv_path
+ 
+    fi
+@@ -36706,8 +37335,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
++echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
+ if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36758,12 +37387,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_struct_tm_gmtoff=no
++	ac_cv_struct_tm_gmtoff=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
+-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
++echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6; }
+ if test $ac_cv_struct_tm_gmtoff = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36776,10 +37406,9 @@
+ 
+ 
+ 
+-
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -36792,18 +37421,19 @@
+ for ac_header in knotifydialog.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36840,15 +37470,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36882,9 +37513,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -36908,25 +37540,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
  esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$cross_compiling" = yes; then
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -36949,10 +37575,9 @@
+ 
+ KOPETE_INCLUDES='-I$(top_srcdir)/kopete/libkopete -I$(top_builddir)/kopete/libkopete -I$(top_srcdir)/kopete/libkopete/avdevice -I$(top_srcdir)/kopete/libkopete/ui -I$(top_builddir)/kopete/libkopete/ui'
+ 
+-# Check whether --enable-smpppd or --disable-smpppd was given.
++# Check whether --enable-smpppd was given.
+ if test "${enable_smpppd+set}" = set; then
+-  enableval="$enable_smpppd"
+-
++  enableval=$enable_smpppd;
+   if test $enableval = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36967,7 +37592,8 @@
+ else
+    COMPILESMPPPDCS=
+ 
+-fi;
++fi
++
+ 
+ 
+ if test -n "$COMPILESMPPPDCS"; then
+@@ -36980,14 +37606,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for xml2-config" >&5
+-echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for xml2-config" >&5
++echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6; }
+    if test -n "$XML_CONFIG"; then
+         kde_cv_path="$XML_CONFIG";
+    else
+         kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -37030,15 +37656,15 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+   { echo "$as_me:$LINENO: WARNING: libxml2 not found anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. " >&5
+ echo "$as_me: WARNING: libxml2 not found anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. " >&2;}
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       XML_CONFIG=$kde_cv_path
+ 
+    fi
+@@ -37061,14 +37687,14 @@
+      LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
+ 
+ 
+-   echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+    if test -n "$XMLLINT"; then
+         kde_cv_path="$XMLLINT";
+    else
+         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -37111,12 +37737,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       XMLLINT=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       XMLLINT=$kde_cv_path
+ 
+    fi
+@@ -37135,14 +37761,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for xslt-config" >&5
+-echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for xslt-config" >&5
++echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6; }
+    if test -n "$XSLT_CONFIG"; then
+         kde_cv_path="$XSLT_CONFIG";
+    else
+         kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -37185,15 +37811,15 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7." >&5
+ echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7." >&2;}
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       XSLT_CONFIG=$kde_cv_path
+ 
+    fi
+@@ -37250,8 +37876,8 @@
+ 
+ # -- Check for installed Valgrind headers --------------------
+ 
+-echo "$as_me:$LINENO: checking for valgrind.h" >&5
+-echo $ECHO_N "checking for valgrind.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for valgrind.h" >&5
++echo $ECHO_N "checking for valgrind.h... $ECHO_C" >&6; }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -37300,9 +37926,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_have_valgrind_h=no
++	ac_have_valgrind_h=no
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_have_valgrind_h = yes; then
+@@ -37313,15 +37940,15 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $ac_have_valgrind_h" >&5
+-echo "${ECHO_T}$ac_have_valgrind_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_have_valgrind_h" >&5
++echo "${ECHO_T}$ac_have_valgrind_h" >&6; }
+ 
+ # -- End valgrind ----------------------------------------------
+ 
+ # -- Determine pointer size for sqlite -------------------------
+ 
+-  echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37332,12 +37959,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int ac__type_new_;
+ int
+ main ()
+ {
+-if ((int *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (int))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -37370,20 +37998,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_int=no
++	ac_cv_type_int=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_int" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -37396,10 +38025,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37437,10 +38067,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37474,30 +38105,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37535,10 +38168,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37572,23 +38206,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -37600,10 +38237,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37637,26 +38275,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37664,8 +38296,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++		   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -37674,22 +38307,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (int))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -37713,28 +38346,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -37762,8 +37228,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=$?
-@@ -37825,8 +37290,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=$?
-@@ -37866,8 +37330,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=$?
-@@ -37923,8 +37386,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=$?
-@@ -37964,8 +37426,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=$?
-@@ -38029,8 +37490,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=$?
-@@ -38061,10 +37521,8 @@
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+-   echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37745,12 +38377,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef short ac__type_new_;
+ int
+ main ()
+ {
+-if ((short *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (short))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -37783,20 +38416,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_short=no
++	ac_cv_type_short=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_short" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -37809,10 +38443,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37850,10 +38485,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37887,30 +38523,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37948,10 +38586,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -37985,23 +38624,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -38013,10 +38655,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38050,26 +38693,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38077,8 +38714,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++		   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -38087,22 +38725,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (short))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -38126,28 +38764,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -38175,8 +37633,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=$?
-@@ -38238,8 +37695,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=$?
-@@ -38279,8 +37735,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=$?
-@@ -38336,8 +37791,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=$?
-@@ -38377,8 +37831,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=$?
-@@ -38442,8 +37895,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=$?
-@@ -38474,10 +37926,8 @@
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38158,12 +38795,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef long ac__type_new_;
+ int
+ main ()
+ {
+-if ((long *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (long))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -38196,20 +38834,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
++	ac_cv_type_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -38222,10 +38861,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38263,10 +38903,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38300,30 +38941,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38361,10 +39004,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38398,23 +39042,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -38426,10 +39073,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38463,26 +39111,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38490,8 +39132,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++		   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -38500,22 +39143,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -38539,28 +39182,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -38588,8 +38038,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=$?
-@@ -38651,8 +38100,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=$?
-@@ -38692,8 +38140,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=$?
-@@ -38749,8 +38196,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=$?
-@@ -38790,8 +38236,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=$?
-@@ -38855,8 +38300,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=$?
-@@ -38887,10 +38331,8 @@
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for char *" >&5
+-echo $ECHO_N "checking for char *... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for char *" >&5
++echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38571,12 +39213,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef char * ac__type_new_;
+ int
+ main ()
+ {
+-if ((char * *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (char *))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -38609,20 +39252,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_char_p=no
++	ac_cv_type_char_p=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+-echo "${ECHO_T}$ac_cv_type_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
++echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of char *" >&5
+-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of char *" >&5
++echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_char_p" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -38635,10 +39279,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38676,10 +39321,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38713,30 +39359,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38774,10 +39422,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38811,23 +39460,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -38839,10 +39491,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -38876,26 +39529,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38903,8 +39550,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char *)); }
+-unsigned long ulongval () { return (long) (sizeof (char *)); }
++		   typedef char * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -38913,22 +39561,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (char *))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -38952,22 +39600,21 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -39025,8 +38467,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=$?
-@@ -39195,8 +38636,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=$?
-@@ -39273,8 +38713,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=$?
-@@ -39433,8 +38872,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=$?
-@@ -39497,8 +38935,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=$?
-@@ -39580,8 +39017,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=$?
-@@ -39661,8 +39097,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=$?
-@@ -39792,8 +39227,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=$?
-@@ -39921,8 +39355,20 @@
+   ac_cv_sizeof_char_p=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+@@ -38988,8 +39635,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38999,17 +39645,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
++echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39046,15 +39692,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
++echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39088,9 +39735,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -39114,25 +39762,18 @@
+ echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
+@@ -39160,8 +39801,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
+-echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
++echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39174,17 +39815,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char XRenderComposite ();
+ int
+ main ()
+ {
+-XRenderComposite ();
++return XRenderComposite ();
+   ;
+   return 0;
+ }
+@@ -39216,14 +39857,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xrender_XRenderComposite=no
++	ac_cv_lib_Xrender_XRenderComposite=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
++echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6; }
+ if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
+   LIB_XRENDER=-lXrender
+ 
+@@ -39246,18 +39888,19 @@
+ for ac_header in tgmath.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39294,15 +39937,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39336,9 +39980,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -39362,25 +40007,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -39400,8 +40039,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -39410,8 +40048,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
+-echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
++echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39454,16 +40092,17 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_scrnsaver_h=no
++	ac_cv_header_X11_extensions_scrnsaver_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6; }
+ if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
+-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39476,17 +40115,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char XScreenSaverQueryInfo ();
+ int
+ main ()
+ {
+-XScreenSaverQueryInfo ();
++return XScreenSaverQueryInfo ();
+   ;
+   return 0;
+ }
+@@ -39518,14 +40157,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xext_XScreenSaverQueryInfo=no
++	ac_cv_lib_Xext_XScreenSaverQueryInfo=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
+ if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
+ 
+ 
+@@ -39539,16 +40179,15 @@
+ 
+         ld_shared_flag=
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
++echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
+ kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -39601,11 +40240,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=cc
++  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -39615,19 +40256,19 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  ld_shared_flag="-shared"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+-        echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
+-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39640,17 +40281,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char XScreenSaverQueryInfo ();
+ int
+ main ()
+ {
+-XScreenSaverQueryInfo ();
++return XScreenSaverQueryInfo ();
+   ;
+   return 0;
+ }
+@@ -39682,14 +40323,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xss_XScreenSaverQueryInfo=no
++	ac_cv_lib_Xss_XScreenSaverQueryInfo=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
+ if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
+ 
+ 
+@@ -39749,18 +40391,18 @@
+ 
+ 
+ 
+-# Check whether --with-xmms or --without-xmms was given.
++# Check whether --with-xmms was given.
+ if test "${with_xmms+set}" = set; then
+-  withval="$with_xmms"
+-
++  withval=$with_xmms;
+ else
+   with_xmms=check
+-fi;
++fi
++
+ 
+ if test "x$with_xmms" != xno; then
+ 
+-  echo "$as_me:$LINENO: checking for libxmms" >&5
+-echo $ECHO_N "checking for libxmms... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for libxmms" >&5
++echo $ECHO_N "checking for libxmms... $ECHO_C" >&6; }
+   if test "${ac_cv_have_xmms+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39813,9 +40455,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_xmms="no"
++	ac_cv_have_xmms="no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS="$ac_save_libs"
+@@ -39824,8 +40467,8 @@
+ 
+ fi
+ 
+-  echo "$as_me:$LINENO: result: $ac_cv_have_xmms" >&5
+-echo "${ECHO_T}$ac_cv_have_xmms" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_have_xmms" >&5
++echo "${ECHO_T}$ac_cv_have_xmms" >&6; }
+   if test "$ac_cv_have_xmms" = "yes"; then
+     XMMS_INCLUDES="`xmms-config --cflags`"
+ 
+@@ -39865,31 +40508,31 @@
+ ac_libgadu_libs=""
+ 
+ 
+-# Check whether --with-external-libgadu or --without-external-libgadu was given.
++# Check whether --with-external-libgadu was given.
+ if test "${with_external_libgadu+set}" = set; then
+-  withval="$with_external_libgadu"
+-
++  withval=$with_external_libgadu;
+ else
+   with_external_libgadu=check
+-fi;
++fi
++
+ 
+ 
+-# Check whether --with-libgadu-includes or --without-libgadu-includes was given.
++# Check whether --with-libgadu-includes was given.
+ if test "${with_libgadu_includes+set}" = set; then
+-  withval="$with_libgadu_includes"
+-    ac_libgadu_includes="$withval"
+-fi;
++  withval=$with_libgadu_includes;   ac_libgadu_includes="$withval"
++fi
++
+ 
+ if test "$ac_libgadu_includes" != "" ; then
+ LIBGG_INCLUDES="-I$ac_libgadu_includes"
+ fi
+ 
+ 
+-# Check whether --with-libgadu-libs or --without-libgadu-libs was given.
++# Check whether --with-libgadu-libs was given.
+ if test "${with_libgadu_libs+set}" = set; then
+-  withval="$with_libgadu_libs"
+-    ac_libgadu_libs="$withval"
+-fi;
++  withval=$with_libgadu_libs;   ac_libgadu_libs="$withval"
++fi
++
+ 
+ if test "$ac_libgadu_libs" != "" ; then
+ 	LIBGG_LIBS="-L$ac_libgadu_libs"
+@@ -39900,8 +40543,8 @@
+ 	ac_save_CFLAGS="$CFLAGS"
+ 	LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
+ 	CFLAGS="$CFLAGS $LIBGG_INCLUDES"
+-	echo "$as_me:$LINENO: checking libgadu version 1.5(rcX) with pthread support" >&5
+-echo $ECHO_N "checking libgadu version 1.5(rcX) with pthread support... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking libgadu version 1.5(rcX) with pthread support" >&5
++echo $ECHO_N "checking libgadu version 1.5(rcX) with pthread support... $ECHO_C" >&6; }
+ 	if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+@@ -39924,8 +40567,20 @@
  	int main()
  	{
  #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -16692,80 +32108,571 @@
  		if ( maj != 1 ) {
  			return 1;
  		}
-@@ -40075,8 +39521,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=$?
-@@ -40165,7 +39610,7 @@
+@@ -39955,8 +40610,8 @@
+   (exit $ac_status); }; }; then
+ 
+ 	LIBGG_LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
+-	echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 	COMPILE_GADU=true
+ 	use_libgadu_copy=
+ 
+@@ -39967,12 +40622,14 @@
+ 
+ ( exit $ac_status )
+ 
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ 	LIBS="$ac_save_LIBS"
+ 	CFLAGS="$ac_save_CFLAGS"
+ 
+@@ -39984,16 +40641,16 @@
+ fi
+ 
+ if test -z "$COMPILE_GADU"; then
+-	echo "$as_me:$LINENO: checking if supplied libgadu-copy can be used" >&5
+-echo $ECHO_N "checking if supplied libgadu-copy can be used... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking if supplied libgadu-copy can be used" >&5
++echo $ECHO_N "checking if supplied libgadu-copy can be used... $ECHO_C" >&6; }
+ 	if test "$kde_use_threading" = "yes"; then
+-		echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 		use_libgadu_copy=yes
+ 		COMPILE_GADU=true
+ 	else
+-		echo "$as_me:$LINENO: result: no (no pthread), support for Gadu-Gadu will be disabled" >&5
+-echo "${ECHO_T}no (no pthread), support for Gadu-Gadu will be disabled" >&6
++		{ echo "$as_me:$LINENO: result: no (no pthread), support for Gadu-Gadu will be disabled" >&5
++echo "${ECHO_T}no (no pthread), support for Gadu-Gadu will be disabled" >&6; }
+ 		use_libgadu_copy=
+ 		COMPILE_GADU=
+ 	fi
+@@ -40034,15 +40691,14 @@
+ 
+ 	fi
+ 
+-echo "$as_me:$LINENO: checking for long long" >&5
+-echo $ECHO_N "checking for long long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+ if test "${kde_cv_c_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -40096,8 +40752,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_c_long_long=no
++	kde_cv_c_long_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   ac_ext=c
+@@ -40109,8 +40766,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5
+-echo "${ECHO_T}$kde_cv_c_long_long" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5
++echo "${ECHO_T}$kde_cv_c_long_long" >&6; }
+ if test "$kde_cv_c_long_long" = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -40134,26 +40791,26 @@
+ ssl_libraries=""
+ ssl_includes=""
+ 
+-# Check whether --with-ssl-dir or --without-ssl-dir was given.
++# Check whether --with-ssl-dir was given.
+ if test "${with_ssl_dir+set}" = set; then
+-  withval="$with_ssl_dir"
+-    ac_ssl_includes="$withval"/include
++  withval=$with_ssl_dir;   ac_ssl_includes="$withval"/include
+        ac_ssl_libraries="$withval"/lib$kdelibsuff
+ 
+-fi;
++fi
++
+ 
+ want_ssl=yes
+ 
+-# Check whether --with-ssl or --without-ssl was given.
++# Check whether --with-ssl was given.
+ if test "${with_ssl+set}" = set; then
+-  withval="$with_ssl"
+-  want_ssl=$withval
+-fi;
++  withval=$with_ssl; want_ssl=$withval
++fi
++
+ 
+ if test $want_ssl = yes; then
+ 
+-echo "$as_me:$LINENO: checking for OpenSSL" >&5
+-echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for OpenSSL" >&5
++echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; }
+ 
+ if test "${ac_cv_have_ssl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -40168,7 +40825,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 40168: $i/$j" >&5
-+    echo "configure: 39613: $i/$j" >&5
+-    echo "configure: 40171: $i/$j" >&5
++    echo "configure: 40828: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -40220,8 +39665,7 @@
-   cat conftest.err >&5
+@@ -40242,9 +40899,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_ssl_rsaref="no"
++	ac_ssl_rsaref="no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -40263,26 +40921,26 @@
+ 
+   eval "$ac_cv_have_ssl"
+ 
+-  echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
+-echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
++echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
+-echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
+-echo "${ECHO_T}$ac_ssl_rsaref" >&6
+-
+-  echo "$as_me:$LINENO: checking for easter eggs" >&5
+-echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
++  { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
++echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
++echo "${ECHO_T}$ac_ssl_rsaref" >&6; }
++
++  { echo "$as_me:$LINENO: checking for easter eggs" >&5
++echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: none found" >&5
++echo "${ECHO_T}none found" >&6; }
+ 
+ else
+   have_ssl=no
+ fi
+ 
+ if test "$have_ssl" = yes; then
+-  echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
++echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
+     if test "${ac_cv_ssl_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40355,8 +41013,8 @@
+ 
+ 
+   eval "$ac_cv_ssl_version"
+-  echo "$as_me:$LINENO: result: $ssl_version" >&5
+-echo "${ECHO_T}$ssl_version" >&6
++  { echo "$as_me:$LINENO: result: $ssl_version" >&5
++echo "${ECHO_T}$ssl_version" >&6; }
+ fi
+ 
+ if test "$have_ssl" != yes; then
+@@ -40414,8 +41072,8 @@
+ mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 
+ 	fi
+-	echo "$as_me:$LINENO: checking for C99-compatible vsnprintf()" >&5
+-echo $ECHO_N "checking for C99-compatible vsnprintf()... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking for C99-compatible vsnprintf()" >&5
++echo $ECHO_N "checking for C99-compatible vsnprintf()... $ECHO_C" >&6; }
+ 	if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+@@ -40450,8 +41108,8 @@
    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=$?
-@@ -40537,8 +39981,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=$?
-@@ -40643,8 +40086,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=$?
-@@ -40743,8 +40185,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=$?
-@@ -40914,8 +40355,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=$?
-@@ -40982,26 +40422,21 @@
+   (exit $ac_status); }; }; then
  
+-		echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  
+ sed -e "s/#undef __GG_LIBGADU_HAVE_C99_VSNPRINTF/#define __GG_LIBGADU_HAVE_C99_VSNPRINTF/" \
+ ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
+@@ -40465,19 +41123,21 @@
  
+ ( exit $ac_status )
+ 
+-		 echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++		 { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
++
++
+ for ac_func in va_copy
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -40503,30 +41163,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -40558,13 +41212,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -40581,9 +41237,9 @@
+ for ac_func in _va_copy
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -40609,30 +41265,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -40664,13 +41314,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -40687,13 +41339,13 @@
+ 
+ 
+ 
+-# Check whether --with-libidn or --without-libidn was given.
++# Check whether --with-libidn was given.
+ if test "${with_libidn+set}" = set; then
+-  withval="$with_libidn"
+-  libidn=$withval
++  withval=$with_libidn; libidn=$withval
+ else
+   libidn=yes
+-fi;
++fi
++
+ 
+ if test "$libidn" != "no"; then
+ 	if test "$libidn" != "yes"; then
+@@ -40706,8 +41358,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
 -
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -40717,17 +41368,17 @@
+ 
+ 
+    if test "${ac_cv_header_idna_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for idna.h" >&5
+-echo $ECHO_N "checking for idna.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for idna.h" >&5
++echo $ECHO_N "checking for idna.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_idna_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_idna_h" >&5
+-echo "${ECHO_T}$ac_cv_header_idna_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_idna_h" >&5
++echo "${ECHO_T}$ac_cv_header_idna_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking idna.h usability" >&5
+-echo $ECHO_N "checking idna.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking idna.h usability" >&5
++echo $ECHO_N "checking idna.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40764,15 +41415,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking idna.h presence" >&5
+-echo $ECHO_N "checking idna.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking idna.h presence" >&5
++echo $ECHO_N "checking idna.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40806,9 +41458,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -40832,25 +41485,18 @@
+ echo "$as_me: WARNING: idna.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: idna.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: idna.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for idna.h" >&5
+-echo $ECHO_N "checking for idna.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for idna.h" >&5
++echo $ECHO_N "checking for idna.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_idna_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_idna_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_idna_h" >&5
+-echo "${ECHO_T}$ac_cv_header_idna_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_idna_h" >&5
++echo "${ECHO_T}$ac_cv_header_idna_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_idna_h = yes; then
+@@ -40879,8 +41525,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for stringprep_check_version in -lidn" >&5
+-echo $ECHO_N "checking for stringprep_check_version in -lidn... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for stringprep_check_version in -lidn" >&5
++echo $ECHO_N "checking for stringprep_check_version in -lidn... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_idn_stringprep_check_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40893,17 +41539,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char stringprep_check_version ();
+ int
+ main ()
+ {
+-stringprep_check_version ();
++return stringprep_check_version ();
+   ;
+   return 0;
+ }
+@@ -40935,14 +41581,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_idn_stringprep_check_version=no
++	ac_cv_lib_idn_stringprep_check_version=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_idn_stringprep_check_version" >&5
+-echo "${ECHO_T}$ac_cv_lib_idn_stringprep_check_version" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_idn_stringprep_check_version" >&5
++echo "${ECHO_T}$ac_cv_lib_idn_stringprep_check_version" >&6; }
+ if test $ac_cv_lib_idn_stringprep_check_version = yes; then
+   libidn=yes; IDN_LIBS="-lidn"
+ else
+@@ -40965,10 +41612,10 @@
+ echo "$as_me: WARNING: Libidn not found, Kopete Jabber plugin will not be compiled" >&2;}
+ fi
+ 
+-echo "$as_me:$LINENO: checking if Libidn can be used" >&5
+-echo $ECHO_N "checking if Libidn can be used... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $libidn" >&5
+-echo "${ECHO_T}$libidn" >&6
++{ echo "$as_me:$LINENO: checking if Libidn can be used" >&5
++echo $ECHO_N "checking if Libidn can be used... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $libidn" >&5
++echo "${ECHO_T}$libidn" >&6; }
+ 
+ 
+ 
+@@ -40985,26 +41632,21 @@
+ 
+ 
+ 
+-
 -#
  # Sametime support
 -#
@@ -16781,11 +32688,12 @@
 -  compile_meanwhile=$enableval
 -else
 -  compile_meanwhile=no
-+# Check whether --enable-meanwhile or --disable-meanwhile was given.
++# Check whether --enable-meanwhile was given.
 +if test "${enable_meanwhile+set}" = set; then
-+  enableval="$enable_meanwhile"
++  enableval=$enable_meanwhile;
++fi
  
- fi;
+-fi;
  
 -# Check and setup for Meanwhile library
 +if test "x$enable_meanwhile" != "xno"; then
@@ -16793,36 +32701,94 @@
  
  
     PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-@@ -41063,23 +40498,23 @@
+@@ -41018,8 +41660,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41034,28 +41676,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -41066,31 +41709,31 @@
    else
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
 -        echo "$as_me:$LINENO: checking for meanwhile >= 0.4.2 meanwhile < 0.5.0" >&5
 -echo $ECHO_N "checking for meanwhile >= 0.4.2 meanwhile < 0.5.0... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for meanwhile >= 1.0.1 meanwhile < 1.1.0" >&5
-+echo $ECHO_N "checking for meanwhile >= 1.0.1 meanwhile < 1.1.0... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for meanwhile >= 1.0.1 meanwhile < 1.1.0" >&5
++echo $ECHO_N "checking for meanwhile >= 1.0.1 meanwhile < 1.1.0... $ECHO_C" >&6; }
  
 -        if $PKG_CONFIG --exists "meanwhile >= 0.4.2 meanwhile < 0.5.0" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +        if $PKG_CONFIG --exists "meanwhile >= 1.0.1 meanwhile < 1.1.0" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
              succeeded=yes
  
-             echo "$as_me:$LINENO: checking MEANWHILE_CFLAGS" >&5
- echo $ECHO_N "checking MEANWHILE_CFLAGS... $ECHO_C" >&6
+-            echo "$as_me:$LINENO: checking MEANWHILE_CFLAGS" >&5
+-echo $ECHO_N "checking MEANWHILE_CFLAGS... $ECHO_C" >&6
 -            MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 0.4.2 meanwhile < 0.5.0"`
+-            echo "$as_me:$LINENO: result: $MEANWHILE_CFLAGS" >&5
+-echo "${ECHO_T}$MEANWHILE_CFLAGS" >&6
+-
+-            echo "$as_me:$LINENO: checking MEANWHILE_LIBS" >&5
+-echo $ECHO_N "checking MEANWHILE_LIBS... $ECHO_C" >&6
+-            MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 0.4.2 meanwhile < 0.5.0"`
+-            echo "$as_me:$LINENO: result: $MEANWHILE_LIBS" >&5
+-echo "${ECHO_T}$MEANWHILE_LIBS" >&6
++            { echo "$as_me:$LINENO: checking MEANWHILE_CFLAGS" >&5
++echo $ECHO_N "checking MEANWHILE_CFLAGS... $ECHO_C" >&6; }
 +            MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.1 meanwhile < 1.1.0"`
-             echo "$as_me:$LINENO: result: $MEANWHILE_CFLAGS" >&5
- echo "${ECHO_T}$MEANWHILE_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MEANWHILE_LIBS" >&5
- echo $ECHO_N "checking MEANWHILE_LIBS... $ECHO_C" >&6
--            MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 0.4.2 meanwhile < 0.5.0"`
++            { echo "$as_me:$LINENO: result: $MEANWHILE_CFLAGS" >&5
++echo "${ECHO_T}$MEANWHILE_CFLAGS" >&6; }
++
++            { echo "$as_me:$LINENO: checking MEANWHILE_LIBS" >&5
++echo $ECHO_N "checking MEANWHILE_LIBS... $ECHO_C" >&6; }
 +            MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.1 meanwhile < 1.1.0"`
-             echo "$as_me:$LINENO: result: $MEANWHILE_LIBS" >&5
- echo "${ECHO_T}$MEANWHILE_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $MEANWHILE_LIBS" >&5
++echo "${ECHO_T}$MEANWHILE_LIBS" >&6; }
          else
-@@ -41087,7 +40522,7 @@
+             MEANWHILE_CFLAGS=""
              MEANWHILE_LIBS=""
              ## If we have a custom action on failure, don't print errors, but
              ## do set a variable so people can do so.
@@ -16831,7 +32797,7 @@
  
          fi
  
-@@ -41100,14 +40535,24 @@
+@@ -41103,14 +41746,24 @@
    fi
  
    if test $succeeded = yes; then
@@ -16847,11 +32813,11 @@
  
 +    if test "x$have_libmeanwhile" = "xno"; then
 +        enable_meanwhile=no
-+        echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
++        { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
 +    else
-+        echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
++        { echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6; }
 +    fi
 +fi
 +
@@ -16859,21 +32825,106 @@
  
  
  # Check and setup for GLib library
-@@ -41219,21 +40664,20 @@
+@@ -41127,8 +41780,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41143,28 +41796,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
  
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
  
++
+   fi
  
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -41175,25 +41829,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for glib-2.0 >= 2.0.0" >&5
+-echo $ECHO_N "checking for glib-2.0 >= 2.0.0... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for glib-2.0 >= 2.0.0" >&5
++echo $ECHO_N "checking for glib-2.0 >= 2.0.0... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists "glib-2.0 >= 2.0.0" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5
+-echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5
++echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6; }
+             GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0.0"`
+-            echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5
+-echo "${ECHO_T}$GLIB_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5
++echo "${ECHO_T}$GLIB_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking GLIB_LIBS" >&5
+-echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking GLIB_LIBS" >&5
++echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6; }
+             GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0.0"`
+-            echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
+-echo "${ECHO_T}$GLIB_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
++echo "${ECHO_T}$GLIB_LIBS" >&6; }
+         else
+             GLIB_CFLAGS=""
+             GLIB_LIBS=""
+@@ -41222,21 +41876,20 @@
+ 
+ 
+ 
 -# Do we everything we need to compile the plugin
 -if test "x$have_meanwhile" != "xyes" || test "x$have_glib" != "xyes"; then
 -    compile_meanwhile=no
-+echo "$as_me:$LINENO: checking if Meanwhile plugin should be compiled" >&5
-+echo $ECHO_N "checking if Meanwhile plugin should be compiled... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Meanwhile plugin should be compiled" >&5
++echo $ECHO_N "checking if Meanwhile plugin should be compiled... $ECHO_C" >&6; }
 +if test "x$enable_meanwhile" != "xno"; then
-+    echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
 +else
-+    echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
  fi
  
 -# Let the user know
@@ -16891,7 +32942,7 @@
    include_meanwhile_TRUE=
    include_meanwhile_FALSE='#'
  else
-@@ -41242,10 +40686,6 @@
+@@ -41245,18 +41898,14 @@
  fi
  
  
@@ -16900,288 +32951,2557 @@
 -#
 -
  # testbed protocol
- # Check whether --enable-testbed or --disable-testbed was given.
+-# Check whether --enable-testbed or --disable-testbed was given.
++# Check whether --enable-testbed was given.
  if test "${enable_testbed+set}" = set; then
-@@ -41333,8 +40773,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
+-  enableval="$enable_testbed"
+-  with_testbed=$enableval
++  enableval=$enable_testbed; with_testbed=$enableval
+ else
+   with_testbed=yes
+-fi;
++fi
++
+ 
+ 
+ if test "$with_testbed" = "yes"; then
+@@ -41276,10 +41925,10 @@
+     msn_webcam_val=1
+ fi
+ 
+-echo "$as_me:$LINENO: checking if MSN webcam support should be enabled" >&5
+-echo $ECHO_N "checking if MSN webcam support should be enabled... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $compile_msn_webcam" >&5
+-echo "${ECHO_T}$compile_msn_webcam" >&6
++{ echo "$as_me:$LINENO: checking if MSN webcam support should be enabled" >&5
++echo $ECHO_N "checking if MSN webcam support should be enabled... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $compile_msn_webcam" >&5
++echo "${ECHO_T}$compile_msn_webcam" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define MSN_WEBCAM $msn_webcam_val
+@@ -41301,8 +41950,8 @@
+ 
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41397,14 +42046,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_bigendian=no
++	ac_cv_c_bigendian=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# It does not; compile a test program.
++	# It does not; compile a test program.
+ if test "$cross_compiling" = yes; then
+   # try to guess the endianness by grepping values into an object file
+   ac_cv_c_bigendian=unknown
+@@ -41414,11 +42064,11 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ int
+ main ()
+@@ -41465,7 +42115,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -41474,17 +42126,22 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++$ac_includes_default
+ int
+ main ()
+ {
++
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+-    long l;
+-    char c[sizeof (long)];
++    long int l;
++    char c[sizeof (long int)];
+   } u;
+   u.l = 1;
+-  exit (u.c[sizeof (long) - 1] == 1);
++  return u.c[sizeof (long int) - 1] == 1;
++
++  ;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -41507,13 +42164,16 @@
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in
+   yes)
+ 
+@@ -41531,8 +42191,8 @@
+    { (exit 1); exit 1; }; } ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41572,6 +42232,7 @@
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
++    if (s) return 0;
+   }
+   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+     int x[] = {25, 17};
+@@ -41590,7 +42251,9 @@
+   }
+   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+     const int foo = 10;
++    if (!foo) return 0;
+   }
++  return !x[0] && !zero.x;
+ #endif
+ 
+   ;
+@@ -41624,12 +42287,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_const=no
++	ac_cv_c_const=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+-echo "${ECHO_T}$ac_cv_c_const" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6; }
+ if test $ac_cv_c_const = no; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41638,8 +42302,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for inline" >&5
+-echo $ECHO_N "checking for inline... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41680,18 +42344,21 @@
    ac_status=$?
-@@ -41376,8 +40815,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; }; then
+-  ac_cv_c_inline=$ac_kw; break
++  ac_cv_c_inline=$ac_kw
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  test "$ac_cv_c_inline" != no && break
+ done
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-echo "${ECHO_T}$ac_cv_c_inline" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+ 
+ 
+ case $ac_cv_c_inline in
+@@ -41709,8 +42376,8 @@
+     ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41721,12 +42388,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((size_t *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (size_t))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -41759,24 +42427,25 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_size_t=no
++	ac_cv_type_size_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+ if test $ac_cv_type_size_t = yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned
++#define size_t unsigned int
+ _ACEOF
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
++echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
+ if test "${ac_cv_struct_tm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41824,12 +42493,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_struct_tm=sys/time.h
++	ac_cv_struct_tm=sys/time.h
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+-echo "${ECHO_T}$ac_cv_struct_tm" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
++echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
+ if test $ac_cv_struct_tm = sys/time.h; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41839,8 +42509,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for uint8_t" >&5
+-echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for uint8_t" >&5
++echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_uint8_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41851,12 +42521,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef uint8_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((uint8_t *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (uint8_t))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -41889,12 +42560,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_uint8_t=no
++	ac_cv_type_uint8_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
+-echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint8_t" >&6; }
+ if test $ac_cv_type_uint8_t = yes; then
+   :
+ else
+@@ -41905,8 +42577,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for uint32_t" >&5
+-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for uint32_t" >&5
++echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_uint32_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41917,12 +42589,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef uint32_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((uint32_t *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (uint32_t))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -41955,12 +42628,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_uint32_t=no
++	ac_cv_type_uint32_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+-echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; }
+ if test $ac_cv_type_uint32_t = yes; then
+   :
+ else
+@@ -41971,8 +42645,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for uint64_t" >&5
+-echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for uint64_t" >&5
++echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_uint64_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41983,12 +42657,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef uint64_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((uint64_t *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (uint64_t))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -42021,12 +42696,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_uint64_t=no
++	ac_cv_type_uint64_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
+-echo "${ECHO_T}$ac_cv_type_uint64_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; }
+ if test $ac_cv_type_uint64_t = yes; then
+   :
+ else
+@@ -42042,9 +42718,9 @@
+ for ac_func in strerror
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -42070,30 +42746,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -42125,13 +42795,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -42144,11 +42816,11 @@
+ # Checks for library functions.
+ 
+ 
+-# Check whether --with-struct-callbacks or --without-struct-callbacks was given.
++# Check whether --with-struct-callbacks was given.
+ if test "${with_struct_callbacks+set}" = set; then
+-  withval="$with_struct_callbacks"
++  withval=$with_struct_callbacks;
++fi
+ 
+-fi;
+ if test "$with_struct_callbacks" = "yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -42172,14 +42844,13 @@
+ YAHOOPKGREQ=""
+ 
+ 
+-echo "$as_me:$LINENO: checking if kppp's headers are installed" >&5
+-echo $ECHO_N "checking if kppp's headers are installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if kppp's headers are installed" >&5
++echo $ECHO_N "checking if kppp's headers are installed... $ECHO_C" >&6; }
+ # this is a little piece of code out of kppp. If it doesn't compile,
+ # kppp is not good for this system. It doesn't do anything, but enough
+ # to fail ;)
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -42259,17 +42930,18 @@
    ac_status=$?
-@@ -41434,8 +40872,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=$?
-@@ -41603,8 +41040,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=$?
-@@ -41664,8 +41100,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=$?
-@@ -41738,8 +41173,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=$?
-@@ -41803,8 +41237,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=$?
-@@ -41868,8 +41301,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=$?
-@@ -41934,8 +41366,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=$?
-@@ -42000,8 +41431,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=$?
-@@ -42104,8 +41534,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=$?
-@@ -42243,8 +41672,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=$?
-@@ -42310,8 +41738,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=$?
-@@ -42467,8 +41894,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=$?
-@@ -42555,7 +41981,7 @@
+   (exit $ac_status); }; }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- DO_NOT_COMPILE="$DO_NOT_COMPILE kppp"
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	 DO_NOT_COMPILE="$DO_NOT_COMPILE kppp"
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+@@ -42283,18 +42955,19 @@
+ for ac_header in sys/param.h string.h
  do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42331,15 +43004,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42373,9 +43047,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -42399,25 +43074,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -42434,8 +43103,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -42444,8 +43112,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5
+-echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5
++echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42488,12 +43156,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_xf86vmode_h=no
++	ac_cv_header_X11_extensions_xf86vmode_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6; }
+ if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then
+ 
+ 
+@@ -42524,26 +43193,26 @@
+ ssl_libraries=""
+ ssl_includes=""
+ 
+-# Check whether --with-ssl-dir or --without-ssl-dir was given.
++# Check whether --with-ssl-dir was given.
+ if test "${with_ssl_dir+set}" = set; then
+-  withval="$with_ssl_dir"
+-    ac_ssl_includes="$withval"/include
++  withval=$with_ssl_dir;   ac_ssl_includes="$withval"/include
+        ac_ssl_libraries="$withval"/lib$kdelibsuff
+ 
+-fi;
++fi
++
+ 
+ want_ssl=yes
+ 
+-# Check whether --with-ssl or --without-ssl was given.
++# Check whether --with-ssl was given.
+ if test "${with_ssl+set}" = set; then
+-  withval="$with_ssl"
+-  want_ssl=$withval
+-fi;
++  withval=$with_ssl; want_ssl=$withval
++fi
++
+ 
+ if test $want_ssl = yes; then
+ 
+-echo "$as_me:$LINENO: checking for OpenSSL" >&5
+-echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for OpenSSL" >&5
++echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; }
+ 
+ if test "${ac_cv_have_ssl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -42558,7 +43227,7 @@
+ do
    for j in openssl/ssl.h;
    do
--    echo "configure: 42558: $i/$j" >&5
-+    echo "configure: 41984: $i/$j" >&5
+-    echo "configure: 42561: $i/$j" >&5
++    echo "configure: 43230: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -42610,8 +42036,7 @@
-   cat conftest.err >&5
+@@ -42632,9 +43301,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_ssl_rsaref="no"
++	ac_ssl_rsaref="no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -42653,26 +43323,26 @@
+ 
+   eval "$ac_cv_have_ssl"
+ 
+-  echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
+-echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
++echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
+-echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
+-echo "${ECHO_T}$ac_ssl_rsaref" >&6
+-
+-  echo "$as_me:$LINENO: checking for easter eggs" >&5
+-echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
++  { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
++echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
++echo "${ECHO_T}$ac_ssl_rsaref" >&6; }
++
++  { echo "$as_me:$LINENO: checking for easter eggs" >&5
++echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: none found" >&5
++echo "${ECHO_T}none found" >&6; }
+ 
+ else
+   have_ssl=no
+ fi
+ 
+ if test "$have_ssl" = yes; then
+-  echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
++echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
+     if test "${ac_cv_ssl_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42745,8 +43415,8 @@
+ 
+ 
+   eval "$ac_cv_ssl_version"
+-  echo "$as_me:$LINENO: result: $ssl_version" >&5
+-echo "${ECHO_T}$ssl_version" >&6
++  { echo "$as_me:$LINENO: result: $ssl_version" >&5
++echo "${ECHO_T}$ssl_version" >&6; }
+ fi
+ 
+ if test "$have_ssl" != yes; then
+@@ -42806,8 +43476,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -42817,17 +43486,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
++echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5
++echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42864,15 +43533,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5
++echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42906,9 +43576,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -42932,25 +43603,18 @@
+ echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
++echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_XTest_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_XTest_h = yes; then
+@@ -42972,8 +43636,8 @@
+ 
+ 
+ #check for getifaddrs(3) (as in glibc >= 2.3 and newer bsds)
+-echo "$as_me:$LINENO: checking for getifaddrs support" >&5
+-echo $ECHO_N "checking for getifaddrs support... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for getifaddrs support" >&5
++echo $ECHO_N "checking for getifaddrs support... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43023,8 +43687,8 @@
+ #define HAVE_GETIFADDRS 1
+ _ACEOF
+ 
+-                        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++                        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+                         COMPILE_GETIFADDRS=""
+ 
+ else
+@@ -43032,11 +43696,12 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-                        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++                        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+                         COMPILE_GETIFADDRS="getifaddrs.cpp"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -43047,8 +43712,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking ktalkd find_user method" >&5
+-echo $ECHO_N "checking ktalkd find_user method... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking ktalkd find_user method" >&5
++echo $ECHO_N "checking ktalkd find_user method... $ECHO_C" >&6; }
+ if test -n "`echo $target_os | grep linux`" ; then
+     if test -d /proc; then
+ 
+@@ -43072,15 +43737,15 @@
+ _ACEOF
+ 
+ 
+-       echo "$as_me:$LINENO: result: using /proc." >&5
+-echo "${ECHO_T}using /proc." >&6
++       { echo "$as_me:$LINENO: result: using /proc." >&5
++echo "${ECHO_T}using /proc." >&6; }
+     else
+-       echo "$as_me:$LINENO: result: /proc not found" >&5
+-echo "${ECHO_T}/proc not found" >&6
++       { echo "$as_me:$LINENO: result: /proc not found" >&5
++echo "${ECHO_T}/proc not found" >&6; }
+     fi
+ else
+-    echo "$as_me:$LINENO: result: not a linux system" >&5
+-echo "${ECHO_T}not a linux system" >&6
++    { echo "$as_me:$LINENO: result: not a linux system" >&5
++echo "${ECHO_T}not a linux system" >&6; }
+ fi
+ 
+ 
+@@ -43099,8 +43764,8 @@
+ 
+ 
+ 
+-    echo "$as_me:$LINENO: checking for utmp file" >&5
+-echo $ECHO_N "checking for utmp file... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for utmp file" >&5
++echo $ECHO_N "checking for utmp file... $ECHO_C" >&6; }
+ 
+     if test "${kde_cv_utmp_file+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -43131,12 +43796,12 @@
+ _ACEOF
+ 
+ 
+-	echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5
+-echo "${ECHO_T}$kde_cv_utmp_file" >&6
++	{ echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5
++echo "${ECHO_T}$kde_cv_utmp_file" >&6; }
+     else
+     	DO_NOT_COMPILE="$DO_NOT_COMPILE ktalkd"
+-	echo "$as_me:$LINENO: result: non found" >&5
+-echo "${ECHO_T}non found" >&6
++	{ echo "$as_me:$LINENO: result: non found" >&5
++echo "${ECHO_T}non found" >&6; }
+     fi
+ 
+ 
+@@ -43146,8 +43811,8 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "$as_me:$LINENO: checking for bsd_ioctl in -lbsd" >&5
+-echo $ECHO_N "checking for bsd_ioctl in -lbsd... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for bsd_ioctl in -lbsd" >&5
++echo $ECHO_N "checking for bsd_ioctl in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_bsd_ioctl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43160,17 +43825,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char bsd_ioctl ();
+ int
+ main ()
+ {
+-bsd_ioctl ();
++return bsd_ioctl ();
+   ;
+   return 0;
+ }
+@@ -43202,14 +43867,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_bsd_bsd_ioctl=no
++	ac_cv_lib_bsd_bsd_ioctl=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_bsd_ioctl" >&5
+-echo "${ECHO_T}$ac_cv_lib_bsd_bsd_ioctl" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_bsd_ioctl" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_bsd_ioctl" >&6; }
+ if test $ac_cv_lib_bsd_bsd_ioctl = yes; then
+   LIBBSD="-lbsd"
+ fi
+@@ -43221,18 +43887,19 @@
+ for ac_header in sgtty.h bsd/sgtty.h sys/select.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43269,15 +43936,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43311,9 +43979,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -43337,25 +44006,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -43368,8 +44031,8 @@
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43419,12 +44082,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_time=no
++	ac_cv_header_time=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -43434,7 +44098,7 @@
+ fi
+ 
+ 
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -43448,8 +44112,8 @@
+ if test "$GCC" = "yes"; then
+ CXXFLAGS="$CXXFLAGS -pedantic-errors"
+ fi
+-echo "$as_me:$LINENO: checking whether the third argument of scandir needs const" >&5
+-echo $ECHO_N "checking whether the third argument of scandir needs const... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the third argument of scandir needs const" >&5
++echo $ECHO_N "checking whether the third argument of scandir needs const... $ECHO_C" >&6; }
+ if test "${ac_cv_scandir_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43502,14 +44166,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_scandir_const=no
++	ac_cv_scandir_const=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $ac_cv_scandir_const" >&5
+-echo "${ECHO_T}$ac_cv_scandir_const" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_scandir_const" >&5
++echo "${ECHO_T}$ac_cv_scandir_const" >&6; }
+ 
+ if eval "test \"`echo $ac_cv_scandir_const`\" = yes"; then
+ 
+@@ -43525,9 +44190,9 @@
+ for ac_func in getifaddrs getnameinfo
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -43553,30 +44218,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -43608,13 +44267,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -43623,8 +44284,8 @@
+ fi
+ done
+ 
+-echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
+-echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
++echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43675,7 +44336,7 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -43722,14 +44383,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_sockaddr_sa_len=no
++	ac_cv_member_struct_sockaddr_sa_len=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
+ if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -43741,19 +44404,18 @@
+ 
+ 
+ 
+-# Check whether --with-wifi or --without-wifi was given.
++# Check whether --with-wifi was given.
+ if test "${with_wifi+set}" = set; then
+-  withval="$with_wifi"
+-
++  withval=$with_wifi;
+ else
+   with_wifi=check
+-fi;
++fi
++
+ 
+ kde_libiw_installed=no
+ if test "x$with_wifi" != xno; then
+ 
+-
+-	 ac_ext=cc
++	 ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -43762,8 +44424,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-	echo "$as_me:$LINENO: checking if wireless tools >= 25 are installed" >&5
+-echo $ECHO_N "checking if wireless tools >= 25 are installed... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking if wireless tools >= 25 are installed" >&5
++echo $ECHO_N "checking if wireless tools >= 25 are installed... $ECHO_C" >&6; }
+ 	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43807,22 +44469,23 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; }; then
+   kde_libiw_installed=yes
+-		echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++		{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_libiw_installed=no
+-		echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	kde_libiw_installed=no
++		{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-	echo "$as_me:$LINENO: checking if wireless tools >= 27 are installed" >&5
+-echo $ECHO_N "checking if wireless tools >= 27 are installed... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking if wireless tools >= 27 are installed" >&5
++echo $ECHO_N "checking if wireless tools >= 27 are installed... $ECHO_C" >&6; }
+ 	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43869,23 +44532,23 @@
    ac_status=$?
-@@ -42843,8 +42268,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IW_27 1
+ _ACEOF
+ 
+ 
+-         echo "$as_me:$LINENO: checking if wireless tools >= 27pre19 are installed" >&5
+-echo $ECHO_N "checking if wireless tools >= 27pre19 are installed... $ECHO_C" >&6
++         { echo "$as_me:$LINENO: checking if wireless tools >= 27pre19 are installed" >&5
++echo $ECHO_N "checking if wireless tools >= 27pre19 are installed... $ECHO_C" >&6; }
+          cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -43930,8 +44593,8 @@
    ac_status=$?
-@@ -43001,8 +42425,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=$?
-@@ -43181,8 +42604,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=$?
-@@ -43248,8 +42670,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=$?
-@@ -43398,8 +42819,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=$?
-@@ -43481,8 +42901,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=$?
-@@ -43587,8 +43006,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=$?
-@@ -43654,8 +43072,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=$?
-@@ -43701,8 +43118,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=$?
-@@ -43790,8 +43206,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=$?
-@@ -43853,8 +43268,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=$?
-@@ -43914,8 +43328,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=$?
-@@ -44930,6 +44343,13 @@
+   (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IW_27pre19 1
+@@ -43943,17 +44606,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-	ac_ext=cc
++	ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -43991,8 +44656,8 @@
+ fi
+ 
+ for i in $ac_topsubdirs; do
+-  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
++echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
+   if test -d $srcdir/$i; then
+     install_it="yes"
+     for j in $DO_NOT_COMPILE; do
+@@ -44003,8 +44668,8 @@
+   else
+     install_it="no"
+   fi
+-  echo "$as_me:$LINENO: result: $install_it" >&5
+-echo "${ECHO_T}$install_it" >&6
++  { echo "$as_me:$LINENO: result: $install_it" >&5
++echo "${ECHO_T}$install_it" >&6; }
+   vari=`echo $i | sed -e 's,[-+.@],_,g'`
+   if test $install_it = "yes"; then
+     TOPSUBDIRS="$TOPSUBDIRS $i"
+@@ -44196,651 +44861,651 @@
+   dcoprss_SUBDIR_included_FALSE=
+ fi
+ 
+-          ac_config_files="$ac_config_files Makefile"
++ac_config_files="$ac_config_files Makefile"
+ 
+-          ac_config_files="$ac_config_files dcoprss/Makefile"
++ac_config_files="$ac_config_files dcoprss/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/Makefile"
++ac_config_files="$ac_config_files doc/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kcontrol/Makefile"
++ac_config_files="$ac_config_files doc/kcontrol/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kcontrol/kcmktalkd/Makefile"
++ac_config_files="$ac_config_files doc/kcontrol/kcmktalkd/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kcontrol/lanbrowser/Makefile"
++ac_config_files="$ac_config_files doc/kcontrol/lanbrowser/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kdict/Makefile"
++ac_config_files="$ac_config_files doc/kdict/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kget/Makefile"
++ac_config_files="$ac_config_files doc/kget/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/knewsticker/Makefile"
++ac_config_files="$ac_config_files doc/knewsticker/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kopete/Makefile"
++ac_config_files="$ac_config_files doc/kopete/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kpf/Makefile"
++ac_config_files="$ac_config_files doc/kpf/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kppp/Makefile"
++ac_config_files="$ac_config_files doc/kppp/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/krdc/Makefile"
++ac_config_files="$ac_config_files doc/krdc/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/krfb/Makefile"
++ac_config_files="$ac_config_files doc/krfb/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/ksirc/Makefile"
++ac_config_files="$ac_config_files doc/ksirc/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/ktalkd/Makefile"
++ac_config_files="$ac_config_files doc/ktalkd/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kwifimanager/Makefile"
++ac_config_files="$ac_config_files doc/kwifimanager/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/lisa/Makefile"
++ac_config_files="$ac_config_files doc/lisa/Makefile"
+ 
+-          ac_config_files="$ac_config_files filesharing/Makefile"
++ac_config_files="$ac_config_files filesharing/Makefile"
+ 
+-          ac_config_files="$ac_config_files filesharing/advanced/Makefile"
++ac_config_files="$ac_config_files filesharing/advanced/Makefile"
+ 
+-          ac_config_files="$ac_config_files filesharing/advanced/kcm_sambaconf/Makefile"
++ac_config_files="$ac_config_files filesharing/advanced/kcm_sambaconf/Makefile"
+ 
+-          ac_config_files="$ac_config_files filesharing/advanced/nfs/Makefile"
++ac_config_files="$ac_config_files filesharing/advanced/nfs/Makefile"
+ 
+-          ac_config_files="$ac_config_files filesharing/advanced/propsdlgplugin/Makefile"
++ac_config_files="$ac_config_files filesharing/advanced/propsdlgplugin/Makefile"
+ 
+-          ac_config_files="$ac_config_files filesharing/simple/Makefile"
++ac_config_files="$ac_config_files filesharing/simple/Makefile"
+ 
+-          ac_config_files="$ac_config_files kdict/Makefile"
++ac_config_files="$ac_config_files kdict/Makefile"
+ 
+-          ac_config_files="$ac_config_files kdict/applet/Makefile"
++ac_config_files="$ac_config_files kdict/applet/Makefile"
+ 
+-          ac_config_files="$ac_config_files kdict/pics/Makefile"
++ac_config_files="$ac_config_files kdict/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files kdnssd/Makefile"
++ac_config_files="$ac_config_files kdnssd/Makefile"
+ 
+-          ac_config_files="$ac_config_files kdnssd/ioslave/Makefile"
++ac_config_files="$ac_config_files kdnssd/ioslave/Makefile"
+ 
+-          ac_config_files="$ac_config_files kdnssd/kdedmodule/Makefile"
++ac_config_files="$ac_config_files kdnssd/kdedmodule/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/torrent/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/torrent/Makefile"
+ 
+-          ac_config_files="$ac_config_files kget/Makefile"
++ac_config_files="$ac_config_files kget/Makefile"
+ 
+-          ac_config_files="$ac_config_files kget/icons/Makefile"
++ac_config_files="$ac_config_files kget/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kget/kget_plug_in/Makefile"
++ac_config_files="$ac_config_files kget/kget_plug_in/Makefile"
+ 
+-          ac_config_files="$ac_config_files kget/pics/Makefile"
++ac_config_files="$ac_config_files kget/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files kget/sounds/Makefile"
++ac_config_files="$ac_config_files kget/sounds/Makefile"
+ 
+-          ac_config_files="$ac_config_files knewsticker/Makefile"
++ac_config_files="$ac_config_files knewsticker/Makefile"
+ 
+-          ac_config_files="$ac_config_files knewsticker/common/Makefile"
++ac_config_files="$ac_config_files knewsticker/common/Makefile"
+ 
+-          ac_config_files="$ac_config_files knewsticker/knewstickerstub/Makefile"
++ac_config_files="$ac_config_files knewsticker/knewstickerstub/Makefile"
+ 
+-          ac_config_files="$ac_config_files knewsticker/kntsrcfilepropsdlg/Makefile"
++ac_config_files="$ac_config_files knewsticker/kntsrcfilepropsdlg/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/Makefile"
++ac_config_files="$ac_config_files kopete/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/icons/Makefile"
++ac_config_files="$ac_config_files kopete/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/addaccountwizard/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/addaccountwizard/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/addcontactwizard/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/addcontactwizard/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/chatwindow/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/chatwindow/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/config/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/config/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/config/accounts/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/config/accounts/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/config/appearance/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/config/appearance/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/config/avdevice/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/config/avdevice/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/config/behavior/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/config/behavior/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/config/identity/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/config/identity/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/config/plugins/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/config/plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/contactlist/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/contactlist/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/kopete/kconf_update/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/kconf_update/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/libkopete/Makefile"
++ac_config_files="$ac_config_files kopete/libkopete/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/libkopete/avdevice/Makefile"
++ac_config_files="$ac_config_files kopete/libkopete/avdevice/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/libkopete/private/Makefile"
++ac_config_files="$ac_config_files kopete/libkopete/private/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/libkopete/tests/Makefile"
++ac_config_files="$ac_config_files kopete/libkopete/tests/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/libkopete/tests/mock/Makefile"
++ac_config_files="$ac_config_files kopete/libkopete/tests/mock/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/libkopete/ui/Makefile"
++ac_config_files="$ac_config_files kopete/libkopete/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/addbookmarks/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/addbookmarks/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/alias/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/alias/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/autoreplace/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/autoreplace/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/autoreplace/icons/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/autoreplace/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/connectionstatus/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/connectionstatus/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/contactnotes/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/contactnotes/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/cryptography/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/cryptography/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/cryptography/icons/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/cryptography/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/highlight/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/highlight/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/highlight/icons/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/highlight/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/history/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/history/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/latex/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/latex/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/latex/icons/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/latex/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/motionautoaway/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/motionautoaway/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/netmeeting/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/netmeeting/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/nowlistening/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/nowlistening/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/smpppdcs/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/smpppdcs/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/smpppdcs/config/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/smpppdcs/config/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/smpppdcs/icons/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/smpppdcs/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/smpppdcs/libsmpppdclient/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/smpppdcs/libsmpppdclient/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/statistics/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/statistics/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/statistics/sqlite/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/statistics/sqlite/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/texteffect/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/texteffect/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/texteffect/icons/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/texteffect/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/translator/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/translator/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/plugins/webpresence/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/webpresence/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/gadu/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/gadu/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/gadu/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/gadu/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/gadu/libgadu/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/gadu/libgadu/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/gadu/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/gadu/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/qca/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/qca/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/qca/src/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/qca/src/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/tasks/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/tasks/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/tests/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/libgroupwise/tests/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/groupwise/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/groupwise/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/irc/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/irc/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/irc/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/irc/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/irc/libkirc/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/irc/libkirc/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/irc/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/irc/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/kioslave/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/kioslave/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/cutestuff/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/cutestuff/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/cutestuff/network/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/cutestuff/network/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/cutestuff/util/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/cutestuff/util/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/include/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/include/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/jabber/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/jabber/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/qca/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/qca/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/qca/src/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/libiris/qca/src/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/jabber/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/meanwhile/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/meanwhile/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/meanwhile/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/meanwhile/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/meanwhile/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/meanwhile/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/msn/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/msn/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/msn/config/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/msn/config/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/msn/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/msn/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/msn/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/msn/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/msn/webcam/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/msn/webcam/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/msn/webcam/libmimic/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/msn/webcam/libmimic/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/aim/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/aim/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/aim/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/aim/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/icq/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/icq/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/icq/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/icq/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/liboscar/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/liboscar/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/oscar/liboscar/tests/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/oscar/liboscar/tests/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/sms/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/sms/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/sms/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/sms/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/sms/services/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/sms/services/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/sms/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/sms/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/testbed/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/testbed/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/testbed/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/testbed/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/winpopup/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/winpopup/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/winpopup/config/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/winpopup/config/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/winpopup/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/winpopup/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/winpopup/libwinpopup/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/winpopup/libwinpopup/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/winpopup/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/winpopup/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/yahoo/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/yahoo/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/yahoo/icons/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/yahoo/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/yahoo/libyahoo2/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/yahoo/libyahoo2/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/protocols/yahoo/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/yahoo/ui/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/sounds/Makefile"
++ac_config_files="$ac_config_files kopete/sounds/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/Adium/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/Adium/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/Kopete/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/Kopete/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/blue/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/blue/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/blue/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/blue/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/blue/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/blue/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/clear/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/clear/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/clear/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/clear/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/clear/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/clear/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/graphite/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/graphite/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/graphite/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/graphite/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/graphite/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/graphite/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/green/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/green/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/green/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/green/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/green/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/green/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/orange/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/orange/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/orange/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/orange/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/orange/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/orange/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/pink/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/pink/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/pink/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/pink/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/pink/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/pink/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/purple/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/purple/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/purple/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/purple/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/purple/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/purple/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/yellow/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/yellow/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/yellow/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/yellow/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/yellow/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat-Trans/yellow/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/blue/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/blue/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/blue/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/blue/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/blue/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/blue/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/clear/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/clear/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/clear/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/clear/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/clear/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/clear/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/graphite/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/graphite/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/graphite/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/graphite/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/graphite/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/graphite/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/green/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/green/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/green/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/green/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/green/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/green/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/orange/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/orange/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/orange/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/orange/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/orange/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/orange/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/pink/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/pink/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/pink/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/pink/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/pink/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/pink/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/purple/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/purple/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/purple/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/purple/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/purple/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/purple/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/yellow/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/yellow/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/yellow/From/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/yellow/From/Makefile"
+ 
+-          ac_config_files="$ac_config_files kopete/styles/data/iChat/yellow/To/Makefile"
++ac_config_files="$ac_config_files kopete/styles/data/iChat/yellow/To/Makefile"
+ 
+-          ac_config_files="$ac_config_files kpf/Makefile"
++ac_config_files="$ac_config_files kpf/Makefile"
+ 
+-          ac_config_files="$ac_config_files kpf/src/Makefile"
++ac_config_files="$ac_config_files kpf/src/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Makefile"
++ac_config_files="$ac_config_files kppp/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Austria/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Austria/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Belarus/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Belarus/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Czech_Republic/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Czech_Republic/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Denmark/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Denmark/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/France/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/France/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Germany/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Germany/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Ireland/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Ireland/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Netherlands/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Netherlands/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/New_Zealand/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/New_Zealand/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Norway/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Norway/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Portugal/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Portugal/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Slovenia/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Slovenia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Sweden/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Sweden/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Switzerland/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Switzerland/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Taiwan/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Taiwan/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Ukraine/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Ukraine/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/United_Kingdom/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/United_Kingdom/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/DB/Provider/Yugoslavia/Makefile"
++ac_config_files="$ac_config_files kppp/DB/Provider/Yugoslavia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Argentina/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Argentina/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Australia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Australia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Austria/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Austria/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Austria/Business_1/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Austria/Business_1/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Austria/Business_2/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Austria/Business_2/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Austria/Minimum/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Austria/Minimum/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Austria/Standard/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Austria/Standard/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Bangladesh/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Bangladesh/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Belgium/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Belgium/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Bosnia_and_Herzegovina/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Bosnia_and_Herzegovina/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Brasil/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Brasil/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Croatia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Croatia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Czechia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Czechia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Denmark/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Denmark/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Estonia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Estonia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Finland/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Finland/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/France/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/France/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Germany/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Germany/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Greece/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Greece/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/HongKong/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/HongKong/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Hungary/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Hungary/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Iceland/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Iceland/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/India/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/India/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Indonesia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Indonesia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Ireland/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Ireland/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Israel/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Israel/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Italy/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Italy/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Jamaica/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Jamaica/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Japan/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Japan/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Kazakhstan/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Kazakhstan/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Luxembourg/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Luxembourg/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Macedonia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Macedonia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Malaysia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Malaysia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Netherlands/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Netherlands/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Norway/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Norway/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Poland/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Poland/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Portugal/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Portugal/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Romania/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Romania/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Russia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Russia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Singapore/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Singapore/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Slovakia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Slovakia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Slovenia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Slovenia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/SouthAfrica/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/SouthAfrica/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/SouthAfrika/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/SouthAfrika/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Spain/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Spain/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Sweden/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Sweden/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Switzerland/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Switzerland/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Turkey/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Turkey/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Ukraine/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Ukraine/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/United_Kingdom/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/United_Kingdom/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Uruguay/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Uruguay/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/Rules/Yugoslavia/Makefile"
++ac_config_files="$ac_config_files kppp/Rules/Yugoslavia/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/icons/Makefile"
++ac_config_files="$ac_config_files kppp/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/logview/Makefile"
++ac_config_files="$ac_config_files kppp/logview/Makefile"
+ 
+-          ac_config_files="$ac_config_files kppp/pixmaps/Makefile"
++ac_config_files="$ac_config_files kppp/pixmaps/Makefile"
+ 
+-          ac_config_files="$ac_config_files krdc/Makefile"
++ac_config_files="$ac_config_files krdc/Makefile"
+ 
+-          ac_config_files="$ac_config_files krdc/rdp/Makefile"
++ac_config_files="$ac_config_files krdc/rdp/Makefile"
+ 
+-          ac_config_files="$ac_config_files krdc/vnc/Makefile"
++ac_config_files="$ac_config_files krdc/vnc/Makefile"
+ 
+-          ac_config_files="$ac_config_files krfb/Makefile"
++ac_config_files="$ac_config_files krfb/Makefile"
+ 
+-          ac_config_files="$ac_config_files krfb/kcm_krfb/Makefile"
++ac_config_files="$ac_config_files krfb/kcm_krfb/Makefile"
+ 
+-          ac_config_files="$ac_config_files krfb/kinetd/Makefile"
++ac_config_files="$ac_config_files krfb/kinetd/Makefile"
+ 
+-          ac_config_files="$ac_config_files krfb/krfb/Makefile"
++ac_config_files="$ac_config_files krfb/krfb/Makefile"
+ 
+-          ac_config_files="$ac_config_files krfb/krfb_httpd/Makefile"
++ac_config_files="$ac_config_files krfb/krfb_httpd/Makefile"
+ 
+-          ac_config_files="$ac_config_files krfb/libvncserver/Makefile"
++ac_config_files="$ac_config_files krfb/libvncserver/Makefile"
+ 
+-          ac_config_files="$ac_config_files krfb/srvloc/Makefile"
++ac_config_files="$ac_config_files krfb/srvloc/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/Makefile"
++ac_config_files="$ac_config_files ksirc/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/KSOpenkSirc/Makefile"
++ac_config_files="$ac_config_files ksirc/KSOpenkSirc/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/KSPrefs/Makefile"
++ac_config_files="$ac_config_files ksirc/KSPrefs/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/KSProgress/Makefile"
++ac_config_files="$ac_config_files ksirc/KSProgress/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/KSTicker/Makefile"
++ac_config_files="$ac_config_files ksirc/KSTicker/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/icons/Makefile"
++ac_config_files="$ac_config_files ksirc/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/img/Makefile"
++ac_config_files="$ac_config_files ksirc/img/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/img/emoticons/Makefile"
++ac_config_files="$ac_config_files ksirc/img/emoticons/Makefile"
+ 
+-          ac_config_files="$ac_config_files ksirc/puke/Makefile"
++ac_config_files="$ac_config_files ksirc/puke/Makefile"
+ 
+-          ac_config_files="$ac_config_files ktalkd/Makefile"
++ac_config_files="$ac_config_files ktalkd/Makefile"
+ 
+-          ac_config_files="$ac_config_files ktalkd/kcmktalkd/Makefile"
++ac_config_files="$ac_config_files ktalkd/kcmktalkd/Makefile"
+ 
+-          ac_config_files="$ac_config_files ktalkd/ktalkd/Makefile"
++ac_config_files="$ac_config_files ktalkd/ktalkd/Makefile"
+ 
+-          ac_config_files="$ac_config_files ktalkd/ktalkd/machines/Makefile"
++ac_config_files="$ac_config_files ktalkd/ktalkd/machines/Makefile"
+ 
+-          ac_config_files="$ac_config_files ktalkd/ktalkdlg/Makefile"
++ac_config_files="$ac_config_files ktalkd/ktalkdlg/Makefile"
+ 
+-          ac_config_files="$ac_config_files ktalkd/mail.local/Makefile"
++ac_config_files="$ac_config_files ktalkd/mail.local/Makefile"
+ 
+-          ac_config_files="$ac_config_files lanbrowsing/Makefile"
++ac_config_files="$ac_config_files lanbrowsing/Makefile"
+ 
+-          ac_config_files="$ac_config_files lanbrowsing/kcmlisa/Makefile"
++ac_config_files="$ac_config_files lanbrowsing/kcmlisa/Makefile"
+ 
+-          ac_config_files="$ac_config_files lanbrowsing/kio_lan/Makefile"
++ac_config_files="$ac_config_files lanbrowsing/kio_lan/Makefile"
+ 
+-          ac_config_files="$ac_config_files lanbrowsing/lisa/Makefile"
++ac_config_files="$ac_config_files lanbrowsing/lisa/Makefile"
+ 
+-          ac_config_files="$ac_config_files librss/Makefile"
++ac_config_files="$ac_config_files librss/Makefile"
+ 
+-          ac_config_files="$ac_config_files wifi/Makefile"
++ac_config_files="$ac_config_files wifi/Makefile"
+ 
+-          ac_config_files="$ac_config_files wifi/kcmwifi/Makefile"
++ac_config_files="$ac_config_files wifi/kcmwifi/Makefile"
+ 
+-          ac_config_files="$ac_config_files wifi/kwireless/Makefile"
++ac_config_files="$ac_config_files wifi/kwireless/Makefile"
+ 
+-          ac_config_files="$ac_config_files wifi/locations/Makefile"
++ac_config_files="$ac_config_files wifi/locations/Makefile"
+ 
+-          ac_config_files="$ac_config_files wifi/pixmaps/Makefile"
++ac_config_files="$ac_config_files wifi/pixmaps/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -44860,39 +45525,58 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       # `set' does not quote correctly, so add quotes (double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    test "x$cache_file" != "x/dev/null" &&
++      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -44901,38 +45585,31 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[	 ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[	 ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++  ac_i=`echo "$ac_i" | sed "$ac_script"`
++  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
++  #    will be set to the directory where LIBOBJS objects are built.
++  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -17195,46 +35515,3215 @@
  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
-@@ -46056,6 +45476,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;t t
- s, at KDECONFIG@,$KDECONFIG,;t t
- s, at kde_libs_prefix@,$kde_libs_prefix,;t t
- s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46494,11 +45917,6 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+@@ -45202,11 +45879,35 @@
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+ 
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -45215,8 +45916,43 @@
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -45230,18 +45966,19 @@
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -45249,159 +45986,120 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
++# CDPATH.
++$as_unset CDPATH
+ 
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++  chmod +x "$as_me.lineno" ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (dirname -- /) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -45410,7 +46108,19 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++  as_executable_p="test -x"
++else
++  as_executable_p=:
++fi
++rm -f conf$$.file
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -45419,31 +46129,14 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
+ 
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# Save the log message, to keep $[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
++# values after options handling.
++ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.59d.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -45451,30 +46144,20 @@
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+ 
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+ 
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++_ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -45501,19 +46184,21 @@
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+-_ACEOF
+ 
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
++configured by $0, generated by GNU Autoconf 2.59d,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
++
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -45524,39 +46209,24 @@
+ do
+   case $1 in
+   --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
+-  -*)
++  *)
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_option=$1
+-     ac_need_defaults=false;;
    esac
  
+   case $ac_option in
+   # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
++  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++    echo "$ac_cs_version"; exit ;;
++  --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+@@ -45566,18 +46236,24 @@
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
++  --he | --h)
++    # Conflict between --help and --header
++    { echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
++  -*) { echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; } ;;
+ 
+-  *) ac_config_targets="$ac_config_targets $1" ;;
++  *) ac_config_targets="$ac_config_targets $1"
++     ac_need_defaults=false ;;
+ 
+   esac
+   shift
+@@ -45593,359 +46269,371 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  CONFIG_SHELL=$SHELL
++  export CONFIG_SHELL
++  exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+ 
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++  echo "$ac_log"
++} >&5
+ 
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+-# INIT-COMMANDS section.
++# INIT-COMMANDS
+ #
+-
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ _ACEOF
+ 
+-
+-
+ cat >>$CONFIG_STATUS <<\_ACEOF
++
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+-  "dcoprss/Makefile" ) CONFIG_FILES="$CONFIG_FILES dcoprss/Makefile" ;;
+-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+-  "doc/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/Makefile" ;;
+-  "doc/kcontrol/kcmktalkd/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmktalkd/Makefile" ;;
+-  "doc/kcontrol/lanbrowser/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/lanbrowser/Makefile" ;;
+-  "doc/kdict/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdict/Makefile" ;;
+-  "doc/kget/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kget/Makefile" ;;
+-  "doc/knewsticker/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/knewsticker/Makefile" ;;
+-  "doc/kopete/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kopete/Makefile" ;;
+-  "doc/kpf/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpf/Makefile" ;;
+-  "doc/kppp/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kppp/Makefile" ;;
+-  "doc/krdc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/krdc/Makefile" ;;
+-  "doc/krfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/krfb/Makefile" ;;
+-  "doc/ksirc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksirc/Makefile" ;;
+-  "doc/ktalkd/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ktalkd/Makefile" ;;
+-  "doc/kwifimanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kwifimanager/Makefile" ;;
+-  "doc/lisa/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/lisa/Makefile" ;;
+-  "filesharing/Makefile" ) CONFIG_FILES="$CONFIG_FILES filesharing/Makefile" ;;
+-  "filesharing/advanced/Makefile" ) CONFIG_FILES="$CONFIG_FILES filesharing/advanced/Makefile" ;;
+-  "filesharing/advanced/kcm_sambaconf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filesharing/advanced/kcm_sambaconf/Makefile" ;;
+-  "filesharing/advanced/nfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES filesharing/advanced/nfs/Makefile" ;;
+-  "filesharing/advanced/propsdlgplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES filesharing/advanced/propsdlgplugin/Makefile" ;;
+-  "filesharing/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES filesharing/simple/Makefile" ;;
+-  "kdict/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdict/Makefile" ;;
+-  "kdict/applet/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdict/applet/Makefile" ;;
+-  "kdict/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdict/pics/Makefile" ;;
+-  "kdnssd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdnssd/Makefile" ;;
+-  "kdnssd/ioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdnssd/ioslave/Makefile" ;;
+-  "kdnssd/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdnssd/kdedmodule/Makefile" ;;
+-  "kfile-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/Makefile" ;;
+-  "kfile-plugins/torrent/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/torrent/Makefile" ;;
+-  "kget/Makefile" ) CONFIG_FILES="$CONFIG_FILES kget/Makefile" ;;
+-  "kget/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kget/icons/Makefile" ;;
+-  "kget/kget_plug_in/Makefile" ) CONFIG_FILES="$CONFIG_FILES kget/kget_plug_in/Makefile" ;;
+-  "kget/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kget/pics/Makefile" ;;
+-  "kget/sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES kget/sounds/Makefile" ;;
+-  "knewsticker/Makefile" ) CONFIG_FILES="$CONFIG_FILES knewsticker/Makefile" ;;
+-  "knewsticker/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES knewsticker/common/Makefile" ;;
+-  "knewsticker/knewstickerstub/Makefile" ) CONFIG_FILES="$CONFIG_FILES knewsticker/knewstickerstub/Makefile" ;;
+-  "knewsticker/kntsrcfilepropsdlg/Makefile" ) CONFIG_FILES="$CONFIG_FILES knewsticker/kntsrcfilepropsdlg/Makefile" ;;
+-  "kopete/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/Makefile" ;;
+-  "kopete/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/icons/Makefile" ;;
+-  "kopete/kopete/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/Makefile" ;;
+-  "kopete/kopete/addaccountwizard/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/addaccountwizard/Makefile" ;;
+-  "kopete/kopete/addcontactwizard/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/addcontactwizard/Makefile" ;;
+-  "kopete/kopete/chatwindow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/chatwindow/Makefile" ;;
+-  "kopete/kopete/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/Makefile" ;;
+-  "kopete/kopete/config/accounts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/accounts/Makefile" ;;
+-  "kopete/kopete/config/appearance/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/appearance/Makefile" ;;
+-  "kopete/kopete/config/avdevice/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/avdevice/Makefile" ;;
+-  "kopete/kopete/config/behavior/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/behavior/Makefile" ;;
+-  "kopete/kopete/config/identity/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/identity/Makefile" ;;
+-  "kopete/kopete/config/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/plugins/Makefile" ;;
+-  "kopete/kopete/contactlist/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/contactlist/Makefile" ;;
+-  "kopete/kopete/kconf_update/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/kconf_update/Makefile" ;;
+-  "kopete/libkopete/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/libkopete/Makefile" ;;
+-  "kopete/libkopete/avdevice/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/libkopete/avdevice/Makefile" ;;
+-  "kopete/libkopete/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/libkopete/private/Makefile" ;;
+-  "kopete/libkopete/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/libkopete/tests/Makefile" ;;
+-  "kopete/libkopete/tests/mock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/libkopete/tests/mock/Makefile" ;;
+-  "kopete/libkopete/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/libkopete/ui/Makefile" ;;
+-  "kopete/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/Makefile" ;;
+-  "kopete/plugins/addbookmarks/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/addbookmarks/Makefile" ;;
+-  "kopete/plugins/alias/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/alias/Makefile" ;;
+-  "kopete/plugins/autoreplace/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/autoreplace/Makefile" ;;
+-  "kopete/plugins/autoreplace/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/autoreplace/icons/Makefile" ;;
+-  "kopete/plugins/connectionstatus/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/connectionstatus/Makefile" ;;
+-  "kopete/plugins/contactnotes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/contactnotes/Makefile" ;;
+-  "kopete/plugins/cryptography/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/cryptography/Makefile" ;;
+-  "kopete/plugins/cryptography/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/cryptography/icons/Makefile" ;;
+-  "kopete/plugins/highlight/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/highlight/Makefile" ;;
+-  "kopete/plugins/highlight/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/highlight/icons/Makefile" ;;
+-  "kopete/plugins/history/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/history/Makefile" ;;
+-  "kopete/plugins/latex/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/latex/Makefile" ;;
+-  "kopete/plugins/latex/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/latex/icons/Makefile" ;;
+-  "kopete/plugins/motionautoaway/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/motionautoaway/Makefile" ;;
+-  "kopete/plugins/netmeeting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/netmeeting/Makefile" ;;
+-  "kopete/plugins/nowlistening/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/nowlistening/Makefile" ;;
+-  "kopete/plugins/smpppdcs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/Makefile" ;;
+-  "kopete/plugins/smpppdcs/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/config/Makefile" ;;
+-  "kopete/plugins/smpppdcs/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/icons/Makefile" ;;
+-  "kopete/plugins/smpppdcs/libsmpppdclient/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/libsmpppdclient/Makefile" ;;
+-  "kopete/plugins/statistics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/statistics/Makefile" ;;
+-  "kopete/plugins/statistics/sqlite/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/statistics/sqlite/Makefile" ;;
+-  "kopete/plugins/texteffect/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/texteffect/Makefile" ;;
+-  "kopete/plugins/texteffect/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/texteffect/icons/Makefile" ;;
+-  "kopete/plugins/translator/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/translator/Makefile" ;;
+-  "kopete/plugins/webpresence/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/webpresence/Makefile" ;;
+-  "kopete/protocols/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/Makefile" ;;
+-  "kopete/protocols/gadu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/Makefile" ;;
+-  "kopete/protocols/gadu/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/icons/Makefile" ;;
+-  "kopete/protocols/gadu/libgadu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/libgadu/Makefile" ;;
+-  "kopete/protocols/gadu/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/ui/Makefile" ;;
+-  "kopete/protocols/groupwise/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/Makefile" ;;
+-  "kopete/protocols/groupwise/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/icons/Makefile" ;;
+-  "kopete/protocols/groupwise/libgroupwise/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/Makefile" ;;
+-  "kopete/protocols/groupwise/libgroupwise/qca/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/qca/Makefile" ;;
+-  "kopete/protocols/groupwise/libgroupwise/qca/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/qca/src/Makefile" ;;
+-  "kopete/protocols/groupwise/libgroupwise/tasks/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/tasks/Makefile" ;;
+-  "kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile" ;;
+-  "kopete/protocols/groupwise/libgroupwise/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/tests/Makefile" ;;
+-  "kopete/protocols/groupwise/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/ui/Makefile" ;;
+-  "kopete/protocols/irc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/Makefile" ;;
+-  "kopete/protocols/irc/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/icons/Makefile" ;;
+-  "kopete/protocols/irc/libkirc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/libkirc/Makefile" ;;
+-  "kopete/protocols/irc/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/ui/Makefile" ;;
+-  "kopete/protocols/jabber/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/Makefile" ;;
+-  "kopete/protocols/jabber/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/icons/Makefile" ;;
+-  "kopete/protocols/jabber/kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/kioslave/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/cutestuff/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/cutestuff/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/cutestuff/network/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/cutestuff/network/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/cutestuff/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/cutestuff/util/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/iris/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/iris/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/include/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/iris/jabber/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/jabber/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/qca/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/qca/Makefile" ;;
+-  "kopete/protocols/jabber/libiris/qca/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/qca/src/Makefile" ;;
+-  "kopete/protocols/jabber/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/ui/Makefile" ;;
+-  "kopete/protocols/meanwhile/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/meanwhile/Makefile" ;;
+-  "kopete/protocols/meanwhile/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/meanwhile/icons/Makefile" ;;
+-  "kopete/protocols/meanwhile/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/meanwhile/ui/Makefile" ;;
+-  "kopete/protocols/msn/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/Makefile" ;;
+-  "kopete/protocols/msn/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/config/Makefile" ;;
+-  "kopete/protocols/msn/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/icons/Makefile" ;;
+-  "kopete/protocols/msn/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/ui/Makefile" ;;
+-  "kopete/protocols/msn/webcam/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/webcam/Makefile" ;;
+-  "kopete/protocols/msn/webcam/libmimic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/webcam/libmimic/Makefile" ;;
+-  "kopete/protocols/oscar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/Makefile" ;;
+-  "kopete/protocols/oscar/aim/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/aim/Makefile" ;;
+-  "kopete/protocols/oscar/aim/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/aim/ui/Makefile" ;;
+-  "kopete/protocols/oscar/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/icons/Makefile" ;;
+-  "kopete/protocols/oscar/icq/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/icq/Makefile" ;;
+-  "kopete/protocols/oscar/icq/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/icq/ui/Makefile" ;;
+-  "kopete/protocols/oscar/liboscar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/liboscar/Makefile" ;;
+-  "kopete/protocols/oscar/liboscar/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/liboscar/tests/Makefile" ;;
+-  "kopete/protocols/sms/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/Makefile" ;;
+-  "kopete/protocols/sms/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/icons/Makefile" ;;
+-  "kopete/protocols/sms/services/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/services/Makefile" ;;
+-  "kopete/protocols/sms/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/ui/Makefile" ;;
+-  "kopete/protocols/testbed/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/testbed/Makefile" ;;
+-  "kopete/protocols/testbed/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/testbed/icons/Makefile" ;;
+-  "kopete/protocols/winpopup/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/Makefile" ;;
+-  "kopete/protocols/winpopup/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/config/Makefile" ;;
+-  "kopete/protocols/winpopup/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/icons/Makefile" ;;
+-  "kopete/protocols/winpopup/libwinpopup/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/libwinpopup/Makefile" ;;
+-  "kopete/protocols/winpopup/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/ui/Makefile" ;;
+-  "kopete/protocols/yahoo/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/Makefile" ;;
+-  "kopete/protocols/yahoo/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/icons/Makefile" ;;
+-  "kopete/protocols/yahoo/libyahoo2/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/libyahoo2/Makefile" ;;
+-  "kopete/protocols/yahoo/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/ui/Makefile" ;;
+-  "kopete/sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/sounds/Makefile" ;;
+-  "kopete/styles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Makefile" ;;
+-  "kopete/styles/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/Makefile" ;;
+-  "kopete/styles/data/Adium/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/Adium/Makefile" ;;
+-  "kopete/styles/data/Kopete/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/Kopete/Makefile" ;;
+-  "kopete/styles/data/iChat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/blue/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/blue/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/blue/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/blue/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/blue/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/blue/To/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/clear/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/clear/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/clear/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/clear/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/clear/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/clear/To/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/graphite/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/graphite/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/graphite/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/graphite/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/graphite/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/graphite/To/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/green/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/green/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/green/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/green/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/green/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/green/To/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/orange/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/orange/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/orange/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/orange/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/orange/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/orange/To/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/pink/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/pink/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/pink/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/pink/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/pink/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/pink/To/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/purple/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/purple/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/purple/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/purple/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/purple/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/purple/To/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/yellow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/yellow/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/yellow/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/yellow/From/Makefile" ;;
+-  "kopete/styles/data/iChat-Trans/yellow/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/yellow/To/Makefile" ;;
+-  "kopete/styles/data/iChat/blue/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/blue/Makefile" ;;
+-  "kopete/styles/data/iChat/blue/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/blue/From/Makefile" ;;
+-  "kopete/styles/data/iChat/blue/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/blue/To/Makefile" ;;
+-  "kopete/styles/data/iChat/clear/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/clear/Makefile" ;;
+-  "kopete/styles/data/iChat/clear/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/clear/From/Makefile" ;;
+-  "kopete/styles/data/iChat/clear/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/clear/To/Makefile" ;;
+-  "kopete/styles/data/iChat/graphite/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/graphite/Makefile" ;;
+-  "kopete/styles/data/iChat/graphite/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/graphite/From/Makefile" ;;
+-  "kopete/styles/data/iChat/graphite/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/graphite/To/Makefile" ;;
+-  "kopete/styles/data/iChat/green/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/green/Makefile" ;;
+-  "kopete/styles/data/iChat/green/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/green/From/Makefile" ;;
+-  "kopete/styles/data/iChat/green/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/green/To/Makefile" ;;
+-  "kopete/styles/data/iChat/orange/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/orange/Makefile" ;;
+-  "kopete/styles/data/iChat/orange/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/orange/From/Makefile" ;;
+-  "kopete/styles/data/iChat/orange/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/orange/To/Makefile" ;;
+-  "kopete/styles/data/iChat/pink/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/pink/Makefile" ;;
+-  "kopete/styles/data/iChat/pink/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/pink/From/Makefile" ;;
+-  "kopete/styles/data/iChat/pink/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/pink/To/Makefile" ;;
+-  "kopete/styles/data/iChat/purple/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/purple/Makefile" ;;
+-  "kopete/styles/data/iChat/purple/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/purple/From/Makefile" ;;
+-  "kopete/styles/data/iChat/purple/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/purple/To/Makefile" ;;
+-  "kopete/styles/data/iChat/yellow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/yellow/Makefile" ;;
+-  "kopete/styles/data/iChat/yellow/From/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/yellow/From/Makefile" ;;
+-  "kopete/styles/data/iChat/yellow/To/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/yellow/To/Makefile" ;;
+-  "kpf/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpf/Makefile" ;;
+-  "kpf/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpf/src/Makefile" ;;
+-  "kppp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Makefile" ;;
+-  "kppp/DB/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Makefile" ;;
+-  "kppp/DB/Provider/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Makefile" ;;
+-  "kppp/DB/Provider/Austria/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Austria/Makefile" ;;
+-  "kppp/DB/Provider/Belarus/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Belarus/Makefile" ;;
+-  "kppp/DB/Provider/Czech_Republic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Czech_Republic/Makefile" ;;
+-  "kppp/DB/Provider/Denmark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Denmark/Makefile" ;;
+-  "kppp/DB/Provider/France/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/France/Makefile" ;;
+-  "kppp/DB/Provider/Germany/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Germany/Makefile" ;;
+-  "kppp/DB/Provider/Ireland/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Ireland/Makefile" ;;
+-  "kppp/DB/Provider/Netherlands/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Netherlands/Makefile" ;;
+-  "kppp/DB/Provider/New_Zealand/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/New_Zealand/Makefile" ;;
+-  "kppp/DB/Provider/Norway/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Norway/Makefile" ;;
+-  "kppp/DB/Provider/Portugal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Portugal/Makefile" ;;
+-  "kppp/DB/Provider/Slovenia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Slovenia/Makefile" ;;
+-  "kppp/DB/Provider/Sweden/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Sweden/Makefile" ;;
+-  "kppp/DB/Provider/Switzerland/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Switzerland/Makefile" ;;
+-  "kppp/DB/Provider/Taiwan/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Taiwan/Makefile" ;;
+-  "kppp/DB/Provider/Ukraine/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Ukraine/Makefile" ;;
+-  "kppp/DB/Provider/United_Kingdom/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/United_Kingdom/Makefile" ;;
+-  "kppp/DB/Provider/Yugoslavia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Yugoslavia/Makefile" ;;
+-  "kppp/Rules/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Makefile" ;;
+-  "kppp/Rules/Argentina/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Argentina/Makefile" ;;
+-  "kppp/Rules/Australia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Australia/Makefile" ;;
+-  "kppp/Rules/Austria/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Makefile" ;;
+-  "kppp/Rules/Austria/Business_1/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Business_1/Makefile" ;;
+-  "kppp/Rules/Austria/Business_2/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Business_2/Makefile" ;;
+-  "kppp/Rules/Austria/Minimum/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Minimum/Makefile" ;;
+-  "kppp/Rules/Austria/Standard/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Standard/Makefile" ;;
+-  "kppp/Rules/Bangladesh/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Bangladesh/Makefile" ;;
+-  "kppp/Rules/Belgium/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Belgium/Makefile" ;;
+-  "kppp/Rules/Bosnia_and_Herzegovina/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Bosnia_and_Herzegovina/Makefile" ;;
+-  "kppp/Rules/Brasil/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Brasil/Makefile" ;;
+-  "kppp/Rules/Croatia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Croatia/Makefile" ;;
+-  "kppp/Rules/Czechia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Czechia/Makefile" ;;
+-  "kppp/Rules/Denmark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Denmark/Makefile" ;;
+-  "kppp/Rules/Estonia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Estonia/Makefile" ;;
+-  "kppp/Rules/Finland/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Finland/Makefile" ;;
+-  "kppp/Rules/France/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/France/Makefile" ;;
+-  "kppp/Rules/Germany/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Germany/Makefile" ;;
+-  "kppp/Rules/Greece/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Greece/Makefile" ;;
+-  "kppp/Rules/HongKong/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/HongKong/Makefile" ;;
+-  "kppp/Rules/Hungary/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Hungary/Makefile" ;;
+-  "kppp/Rules/Iceland/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Iceland/Makefile" ;;
+-  "kppp/Rules/India/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/India/Makefile" ;;
+-  "kppp/Rules/Indonesia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Indonesia/Makefile" ;;
+-  "kppp/Rules/Ireland/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Ireland/Makefile" ;;
+-  "kppp/Rules/Israel/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Israel/Makefile" ;;
+-  "kppp/Rules/Italy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Italy/Makefile" ;;
+-  "kppp/Rules/Jamaica/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Jamaica/Makefile" ;;
+-  "kppp/Rules/Japan/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Japan/Makefile" ;;
+-  "kppp/Rules/Kazakhstan/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Kazakhstan/Makefile" ;;
+-  "kppp/Rules/Luxembourg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Luxembourg/Makefile" ;;
+-  "kppp/Rules/Macedonia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Macedonia/Makefile" ;;
+-  "kppp/Rules/Malaysia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Malaysia/Makefile" ;;
+-  "kppp/Rules/Netherlands/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Netherlands/Makefile" ;;
+-  "kppp/Rules/Norway/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Norway/Makefile" ;;
+-  "kppp/Rules/Poland/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Poland/Makefile" ;;
+-  "kppp/Rules/Portugal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Portugal/Makefile" ;;
+-  "kppp/Rules/Romania/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Romania/Makefile" ;;
+-  "kppp/Rules/Russia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Russia/Makefile" ;;
+-  "kppp/Rules/Singapore/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Singapore/Makefile" ;;
+-  "kppp/Rules/Slovakia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Slovakia/Makefile" ;;
+-  "kppp/Rules/Slovenia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Slovenia/Makefile" ;;
+-  "kppp/Rules/SouthAfrica/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/SouthAfrica/Makefile" ;;
+-  "kppp/Rules/SouthAfrika/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/SouthAfrika/Makefile" ;;
+-  "kppp/Rules/Spain/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Spain/Makefile" ;;
+-  "kppp/Rules/Sweden/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Sweden/Makefile" ;;
+-  "kppp/Rules/Switzerland/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Switzerland/Makefile" ;;
+-  "kppp/Rules/Turkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Turkey/Makefile" ;;
+-  "kppp/Rules/Ukraine/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Ukraine/Makefile" ;;
+-  "kppp/Rules/United_Kingdom/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/United_Kingdom/Makefile" ;;
+-  "kppp/Rules/Uruguay/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Uruguay/Makefile" ;;
+-  "kppp/Rules/Yugoslavia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/Rules/Yugoslavia/Makefile" ;;
+-  "kppp/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/icons/Makefile" ;;
+-  "kppp/logview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/logview/Makefile" ;;
+-  "kppp/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kppp/pixmaps/Makefile" ;;
+-  "krdc/Makefile" ) CONFIG_FILES="$CONFIG_FILES krdc/Makefile" ;;
+-  "krdc/rdp/Makefile" ) CONFIG_FILES="$CONFIG_FILES krdc/rdp/Makefile" ;;
+-  "krdc/vnc/Makefile" ) CONFIG_FILES="$CONFIG_FILES krdc/vnc/Makefile" ;;
+-  "krfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES krfb/Makefile" ;;
+-  "krfb/kcm_krfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES krfb/kcm_krfb/Makefile" ;;
+-  "krfb/kinetd/Makefile" ) CONFIG_FILES="$CONFIG_FILES krfb/kinetd/Makefile" ;;
+-  "krfb/krfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES krfb/krfb/Makefile" ;;
+-  "krfb/krfb_httpd/Makefile" ) CONFIG_FILES="$CONFIG_FILES krfb/krfb_httpd/Makefile" ;;
+-  "krfb/libvncserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES krfb/libvncserver/Makefile" ;;
+-  "krfb/srvloc/Makefile" ) CONFIG_FILES="$CONFIG_FILES krfb/srvloc/Makefile" ;;
+-  "ksirc/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/Makefile" ;;
+-  "ksirc/KSOpenkSirc/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/KSOpenkSirc/Makefile" ;;
+-  "ksirc/KSPrefs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/KSPrefs/Makefile" ;;
+-  "ksirc/KSProgress/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/KSProgress/Makefile" ;;
+-  "ksirc/KSTicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/KSTicker/Makefile" ;;
+-  "ksirc/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/icons/Makefile" ;;
+-  "ksirc/img/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/img/Makefile" ;;
+-  "ksirc/img/emoticons/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/img/emoticons/Makefile" ;;
+-  "ksirc/puke/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksirc/puke/Makefile" ;;
+-  "ktalkd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktalkd/Makefile" ;;
+-  "ktalkd/kcmktalkd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktalkd/kcmktalkd/Makefile" ;;
+-  "ktalkd/ktalkd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktalkd/ktalkd/Makefile" ;;
+-  "ktalkd/ktalkd/machines/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktalkd/ktalkd/machines/Makefile" ;;
+-  "ktalkd/ktalkdlg/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktalkd/ktalkdlg/Makefile" ;;
+-  "ktalkd/mail.local/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktalkd/mail.local/Makefile" ;;
+-  "lanbrowsing/Makefile" ) CONFIG_FILES="$CONFIG_FILES lanbrowsing/Makefile" ;;
+-  "lanbrowsing/kcmlisa/Makefile" ) CONFIG_FILES="$CONFIG_FILES lanbrowsing/kcmlisa/Makefile" ;;
+-  "lanbrowsing/kio_lan/Makefile" ) CONFIG_FILES="$CONFIG_FILES lanbrowsing/kio_lan/Makefile" ;;
+-  "lanbrowsing/lisa/Makefile" ) CONFIG_FILES="$CONFIG_FILES lanbrowsing/lisa/Makefile" ;;
+-  "librss/Makefile" ) CONFIG_FILES="$CONFIG_FILES librss/Makefile" ;;
+-  "wifi/Makefile" ) CONFIG_FILES="$CONFIG_FILES wifi/Makefile" ;;
+-  "wifi/kcmwifi/Makefile" ) CONFIG_FILES="$CONFIG_FILES wifi/kcmwifi/Makefile" ;;
+-  "wifi/kwireless/Makefile" ) CONFIG_FILES="$CONFIG_FILES wifi/kwireless/Makefile" ;;
+-  "wifi/locations/Makefile" ) CONFIG_FILES="$CONFIG_FILES wifi/locations/Makefile" ;;
+-  "wifi/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES wifi/pixmaps/Makefile" ;;
+-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++  case $ac_config_target in
++    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++    "dcoprss/Makefile") CONFIG_FILES="$CONFIG_FILES dcoprss/Makefile" ;;
++    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++    "doc/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/Makefile" ;;
++    "doc/kcontrol/kcmktalkd/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmktalkd/Makefile" ;;
++    "doc/kcontrol/lanbrowser/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/lanbrowser/Makefile" ;;
++    "doc/kdict/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdict/Makefile" ;;
++    "doc/kget/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kget/Makefile" ;;
++    "doc/knewsticker/Makefile") CONFIG_FILES="$CONFIG_FILES doc/knewsticker/Makefile" ;;
++    "doc/kopete/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kopete/Makefile" ;;
++    "doc/kpf/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kpf/Makefile" ;;
++    "doc/kppp/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kppp/Makefile" ;;
++    "doc/krdc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/krdc/Makefile" ;;
++    "doc/krfb/Makefile") CONFIG_FILES="$CONFIG_FILES doc/krfb/Makefile" ;;
++    "doc/ksirc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ksirc/Makefile" ;;
++    "doc/ktalkd/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ktalkd/Makefile" ;;
++    "doc/kwifimanager/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kwifimanager/Makefile" ;;
++    "doc/lisa/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lisa/Makefile" ;;
++    "filesharing/Makefile") CONFIG_FILES="$CONFIG_FILES filesharing/Makefile" ;;
++    "filesharing/advanced/Makefile") CONFIG_FILES="$CONFIG_FILES filesharing/advanced/Makefile" ;;
++    "filesharing/advanced/kcm_sambaconf/Makefile") CONFIG_FILES="$CONFIG_FILES filesharing/advanced/kcm_sambaconf/Makefile" ;;
++    "filesharing/advanced/nfs/Makefile") CONFIG_FILES="$CONFIG_FILES filesharing/advanced/nfs/Makefile" ;;
++    "filesharing/advanced/propsdlgplugin/Makefile") CONFIG_FILES="$CONFIG_FILES filesharing/advanced/propsdlgplugin/Makefile" ;;
++    "filesharing/simple/Makefile") CONFIG_FILES="$CONFIG_FILES filesharing/simple/Makefile" ;;
++    "kdict/Makefile") CONFIG_FILES="$CONFIG_FILES kdict/Makefile" ;;
++    "kdict/applet/Makefile") CONFIG_FILES="$CONFIG_FILES kdict/applet/Makefile" ;;
++    "kdict/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kdict/pics/Makefile" ;;
++    "kdnssd/Makefile") CONFIG_FILES="$CONFIG_FILES kdnssd/Makefile" ;;
++    "kdnssd/ioslave/Makefile") CONFIG_FILES="$CONFIG_FILES kdnssd/ioslave/Makefile" ;;
++    "kdnssd/kdedmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kdnssd/kdedmodule/Makefile" ;;
++    "kfile-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/Makefile" ;;
++    "kfile-plugins/torrent/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/torrent/Makefile" ;;
++    "kget/Makefile") CONFIG_FILES="$CONFIG_FILES kget/Makefile" ;;
++    "kget/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kget/icons/Makefile" ;;
++    "kget/kget_plug_in/Makefile") CONFIG_FILES="$CONFIG_FILES kget/kget_plug_in/Makefile" ;;
++    "kget/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kget/pics/Makefile" ;;
++    "kget/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES kget/sounds/Makefile" ;;
++    "knewsticker/Makefile") CONFIG_FILES="$CONFIG_FILES knewsticker/Makefile" ;;
++    "knewsticker/common/Makefile") CONFIG_FILES="$CONFIG_FILES knewsticker/common/Makefile" ;;
++    "knewsticker/knewstickerstub/Makefile") CONFIG_FILES="$CONFIG_FILES knewsticker/knewstickerstub/Makefile" ;;
++    "knewsticker/kntsrcfilepropsdlg/Makefile") CONFIG_FILES="$CONFIG_FILES knewsticker/kntsrcfilepropsdlg/Makefile" ;;
++    "kopete/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/Makefile" ;;
++    "kopete/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/icons/Makefile" ;;
++    "kopete/kopete/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/Makefile" ;;
++    "kopete/kopete/addaccountwizard/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/addaccountwizard/Makefile" ;;
++    "kopete/kopete/addcontactwizard/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/addcontactwizard/Makefile" ;;
++    "kopete/kopete/chatwindow/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/chatwindow/Makefile" ;;
++    "kopete/kopete/config/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/Makefile" ;;
++    "kopete/kopete/config/accounts/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/accounts/Makefile" ;;
++    "kopete/kopete/config/appearance/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/appearance/Makefile" ;;
++    "kopete/kopete/config/avdevice/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/avdevice/Makefile" ;;
++    "kopete/kopete/config/behavior/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/behavior/Makefile" ;;
++    "kopete/kopete/config/identity/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/identity/Makefile" ;;
++    "kopete/kopete/config/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/config/plugins/Makefile" ;;
++    "kopete/kopete/contactlist/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/contactlist/Makefile" ;;
++    "kopete/kopete/kconf_update/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/kconf_update/Makefile" ;;
++    "kopete/libkopete/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/libkopete/Makefile" ;;
++    "kopete/libkopete/avdevice/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/libkopete/avdevice/Makefile" ;;
++    "kopete/libkopete/private/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/libkopete/private/Makefile" ;;
++    "kopete/libkopete/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/libkopete/tests/Makefile" ;;
++    "kopete/libkopete/tests/mock/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/libkopete/tests/mock/Makefile" ;;
++    "kopete/libkopete/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/libkopete/ui/Makefile" ;;
++    "kopete/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/Makefile" ;;
++    "kopete/plugins/addbookmarks/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/addbookmarks/Makefile" ;;
++    "kopete/plugins/alias/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/alias/Makefile" ;;
++    "kopete/plugins/autoreplace/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/autoreplace/Makefile" ;;
++    "kopete/plugins/autoreplace/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/autoreplace/icons/Makefile" ;;
++    "kopete/plugins/connectionstatus/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/connectionstatus/Makefile" ;;
++    "kopete/plugins/contactnotes/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/contactnotes/Makefile" ;;
++    "kopete/plugins/cryptography/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/cryptography/Makefile" ;;
++    "kopete/plugins/cryptography/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/cryptography/icons/Makefile" ;;
++    "kopete/plugins/highlight/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/highlight/Makefile" ;;
++    "kopete/plugins/highlight/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/highlight/icons/Makefile" ;;
++    "kopete/plugins/history/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/history/Makefile" ;;
++    "kopete/plugins/latex/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/latex/Makefile" ;;
++    "kopete/plugins/latex/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/latex/icons/Makefile" ;;
++    "kopete/plugins/motionautoaway/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/motionautoaway/Makefile" ;;
++    "kopete/plugins/netmeeting/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/netmeeting/Makefile" ;;
++    "kopete/plugins/nowlistening/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/nowlistening/Makefile" ;;
++    "kopete/plugins/smpppdcs/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/Makefile" ;;
++    "kopete/plugins/smpppdcs/config/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/config/Makefile" ;;
++    "kopete/plugins/smpppdcs/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/icons/Makefile" ;;
++    "kopete/plugins/smpppdcs/libsmpppdclient/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/libsmpppdclient/Makefile" ;;
++    "kopete/plugins/statistics/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/statistics/Makefile" ;;
++    "kopete/plugins/statistics/sqlite/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/statistics/sqlite/Makefile" ;;
++    "kopete/plugins/texteffect/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/texteffect/Makefile" ;;
++    "kopete/plugins/texteffect/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/texteffect/icons/Makefile" ;;
++    "kopete/plugins/translator/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/translator/Makefile" ;;
++    "kopete/plugins/webpresence/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/webpresence/Makefile" ;;
++    "kopete/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/Makefile" ;;
++    "kopete/protocols/gadu/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/Makefile" ;;
++    "kopete/protocols/gadu/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/icons/Makefile" ;;
++    "kopete/protocols/gadu/libgadu/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/libgadu/Makefile" ;;
++    "kopete/protocols/gadu/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/gadu/ui/Makefile" ;;
++    "kopete/protocols/groupwise/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/Makefile" ;;
++    "kopete/protocols/groupwise/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/icons/Makefile" ;;
++    "kopete/protocols/groupwise/libgroupwise/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/Makefile" ;;
++    "kopete/protocols/groupwise/libgroupwise/qca/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/qca/Makefile" ;;
++    "kopete/protocols/groupwise/libgroupwise/qca/src/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/qca/src/Makefile" ;;
++    "kopete/protocols/groupwise/libgroupwise/tasks/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/tasks/Makefile" ;;
++    "kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile" ;;
++    "kopete/protocols/groupwise/libgroupwise/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/libgroupwise/tests/Makefile" ;;
++    "kopete/protocols/groupwise/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/groupwise/ui/Makefile" ;;
++    "kopete/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/Makefile" ;;
++    "kopete/protocols/irc/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/icons/Makefile" ;;
++    "kopete/protocols/irc/libkirc/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/libkirc/Makefile" ;;
++    "kopete/protocols/irc/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/irc/ui/Makefile" ;;
++    "kopete/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/Makefile" ;;
++    "kopete/protocols/jabber/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/icons/Makefile" ;;
++    "kopete/protocols/jabber/kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/kioslave/Makefile" ;;
++    "kopete/protocols/jabber/libiris/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/Makefile" ;;
++    "kopete/protocols/jabber/libiris/cutestuff/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/cutestuff/Makefile" ;;
++    "kopete/protocols/jabber/libiris/cutestuff/network/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/cutestuff/network/Makefile" ;;
++    "kopete/protocols/jabber/libiris/cutestuff/util/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/cutestuff/util/Makefile" ;;
++    "kopete/protocols/jabber/libiris/iris/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/Makefile" ;;
++    "kopete/protocols/jabber/libiris/iris/include/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/include/Makefile" ;;
++    "kopete/protocols/jabber/libiris/iris/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/jabber/Makefile" ;;
++    "kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile" ;;
++    "kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile" ;;
++    "kopete/protocols/jabber/libiris/qca/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/qca/Makefile" ;;
++    "kopete/protocols/jabber/libiris/qca/src/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/libiris/qca/src/Makefile" ;;
++    "kopete/protocols/jabber/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/ui/Makefile" ;;
++    "kopete/protocols/meanwhile/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/meanwhile/Makefile" ;;
++    "kopete/protocols/meanwhile/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/meanwhile/icons/Makefile" ;;
++    "kopete/protocols/meanwhile/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/meanwhile/ui/Makefile" ;;
++    "kopete/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/Makefile" ;;
++    "kopete/protocols/msn/config/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/config/Makefile" ;;
++    "kopete/protocols/msn/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/icons/Makefile" ;;
++    "kopete/protocols/msn/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/ui/Makefile" ;;
++    "kopete/protocols/msn/webcam/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/webcam/Makefile" ;;
++    "kopete/protocols/msn/webcam/libmimic/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/msn/webcam/libmimic/Makefile" ;;
++    "kopete/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/Makefile" ;;
++    "kopete/protocols/oscar/aim/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/aim/Makefile" ;;
++    "kopete/protocols/oscar/aim/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/aim/ui/Makefile" ;;
++    "kopete/protocols/oscar/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/icons/Makefile" ;;
++    "kopete/protocols/oscar/icq/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/icq/Makefile" ;;
++    "kopete/protocols/oscar/icq/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/icq/ui/Makefile" ;;
++    "kopete/protocols/oscar/liboscar/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/liboscar/Makefile" ;;
++    "kopete/protocols/oscar/liboscar/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/oscar/liboscar/tests/Makefile" ;;
++    "kopete/protocols/sms/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/Makefile" ;;
++    "kopete/protocols/sms/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/icons/Makefile" ;;
++    "kopete/protocols/sms/services/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/services/Makefile" ;;
++    "kopete/protocols/sms/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/sms/ui/Makefile" ;;
++    "kopete/protocols/testbed/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/testbed/Makefile" ;;
++    "kopete/protocols/testbed/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/testbed/icons/Makefile" ;;
++    "kopete/protocols/winpopup/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/Makefile" ;;
++    "kopete/protocols/winpopup/config/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/config/Makefile" ;;
++    "kopete/protocols/winpopup/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/icons/Makefile" ;;
++    "kopete/protocols/winpopup/libwinpopup/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/libwinpopup/Makefile" ;;
++    "kopete/protocols/winpopup/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/winpopup/ui/Makefile" ;;
++    "kopete/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/Makefile" ;;
++    "kopete/protocols/yahoo/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/icons/Makefile" ;;
++    "kopete/protocols/yahoo/libyahoo2/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/libyahoo2/Makefile" ;;
++    "kopete/protocols/yahoo/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/ui/Makefile" ;;
++    "kopete/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/sounds/Makefile" ;;
++    "kopete/styles/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Makefile" ;;
++    "kopete/styles/data/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/Makefile" ;;
++    "kopete/styles/data/Adium/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/Adium/Makefile" ;;
++    "kopete/styles/data/Kopete/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/Kopete/Makefile" ;;
++    "kopete/styles/data/iChat/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/blue/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/blue/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/blue/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/blue/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/blue/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/blue/To/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/clear/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/clear/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/clear/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/clear/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/clear/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/clear/To/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/graphite/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/graphite/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/graphite/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/graphite/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/graphite/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/graphite/To/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/green/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/green/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/green/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/green/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/green/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/green/To/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/orange/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/orange/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/orange/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/orange/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/orange/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/orange/To/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/pink/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/pink/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/pink/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/pink/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/pink/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/pink/To/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/purple/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/purple/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/purple/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/purple/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/purple/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/purple/To/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/yellow/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/yellow/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/yellow/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/yellow/From/Makefile" ;;
++    "kopete/styles/data/iChat-Trans/yellow/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat-Trans/yellow/To/Makefile" ;;
++    "kopete/styles/data/iChat/blue/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/blue/Makefile" ;;
++    "kopete/styles/data/iChat/blue/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/blue/From/Makefile" ;;
++    "kopete/styles/data/iChat/blue/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/blue/To/Makefile" ;;
++    "kopete/styles/data/iChat/clear/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/clear/Makefile" ;;
++    "kopete/styles/data/iChat/clear/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/clear/From/Makefile" ;;
++    "kopete/styles/data/iChat/clear/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/clear/To/Makefile" ;;
++    "kopete/styles/data/iChat/graphite/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/graphite/Makefile" ;;
++    "kopete/styles/data/iChat/graphite/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/graphite/From/Makefile" ;;
++    "kopete/styles/data/iChat/graphite/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/graphite/To/Makefile" ;;
++    "kopete/styles/data/iChat/green/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/green/Makefile" ;;
++    "kopete/styles/data/iChat/green/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/green/From/Makefile" ;;
++    "kopete/styles/data/iChat/green/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/green/To/Makefile" ;;
++    "kopete/styles/data/iChat/orange/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/orange/Makefile" ;;
++    "kopete/styles/data/iChat/orange/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/orange/From/Makefile" ;;
++    "kopete/styles/data/iChat/orange/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/orange/To/Makefile" ;;
++    "kopete/styles/data/iChat/pink/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/pink/Makefile" ;;
++    "kopete/styles/data/iChat/pink/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/pink/From/Makefile" ;;
++    "kopete/styles/data/iChat/pink/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/pink/To/Makefile" ;;
++    "kopete/styles/data/iChat/purple/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/purple/Makefile" ;;
++    "kopete/styles/data/iChat/purple/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/purple/From/Makefile" ;;
++    "kopete/styles/data/iChat/purple/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/purple/To/Makefile" ;;
++    "kopete/styles/data/iChat/yellow/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/yellow/Makefile" ;;
++    "kopete/styles/data/iChat/yellow/From/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/yellow/From/Makefile" ;;
++    "kopete/styles/data/iChat/yellow/To/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/data/iChat/yellow/To/Makefile" ;;
++    "kpf/Makefile") CONFIG_FILES="$CONFIG_FILES kpf/Makefile" ;;
++    "kpf/src/Makefile") CONFIG_FILES="$CONFIG_FILES kpf/src/Makefile" ;;
++    "kppp/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Makefile" ;;
++    "kppp/DB/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Makefile" ;;
++    "kppp/DB/Provider/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Makefile" ;;
++    "kppp/DB/Provider/Austria/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Austria/Makefile" ;;
++    "kppp/DB/Provider/Belarus/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Belarus/Makefile" ;;
++    "kppp/DB/Provider/Czech_Republic/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Czech_Republic/Makefile" ;;
++    "kppp/DB/Provider/Denmark/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Denmark/Makefile" ;;
++    "kppp/DB/Provider/France/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/France/Makefile" ;;
++    "kppp/DB/Provider/Germany/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Germany/Makefile" ;;
++    "kppp/DB/Provider/Ireland/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Ireland/Makefile" ;;
++    "kppp/DB/Provider/Netherlands/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Netherlands/Makefile" ;;
++    "kppp/DB/Provider/New_Zealand/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/New_Zealand/Makefile" ;;
++    "kppp/DB/Provider/Norway/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Norway/Makefile" ;;
++    "kppp/DB/Provider/Portugal/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Portugal/Makefile" ;;
++    "kppp/DB/Provider/Slovenia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Slovenia/Makefile" ;;
++    "kppp/DB/Provider/Sweden/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Sweden/Makefile" ;;
++    "kppp/DB/Provider/Switzerland/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Switzerland/Makefile" ;;
++    "kppp/DB/Provider/Taiwan/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Taiwan/Makefile" ;;
++    "kppp/DB/Provider/Ukraine/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Ukraine/Makefile" ;;
++    "kppp/DB/Provider/United_Kingdom/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/United_Kingdom/Makefile" ;;
++    "kppp/DB/Provider/Yugoslavia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/DB/Provider/Yugoslavia/Makefile" ;;
++    "kppp/Rules/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Makefile" ;;
++    "kppp/Rules/Argentina/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Argentina/Makefile" ;;
++    "kppp/Rules/Australia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Australia/Makefile" ;;
++    "kppp/Rules/Austria/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Makefile" ;;
++    "kppp/Rules/Austria/Business_1/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Business_1/Makefile" ;;
++    "kppp/Rules/Austria/Business_2/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Business_2/Makefile" ;;
++    "kppp/Rules/Austria/Minimum/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Minimum/Makefile" ;;
++    "kppp/Rules/Austria/Standard/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Austria/Standard/Makefile" ;;
++    "kppp/Rules/Bangladesh/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Bangladesh/Makefile" ;;
++    "kppp/Rules/Belgium/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Belgium/Makefile" ;;
++    "kppp/Rules/Bosnia_and_Herzegovina/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Bosnia_and_Herzegovina/Makefile" ;;
++    "kppp/Rules/Brasil/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Brasil/Makefile" ;;
++    "kppp/Rules/Croatia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Croatia/Makefile" ;;
++    "kppp/Rules/Czechia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Czechia/Makefile" ;;
++    "kppp/Rules/Denmark/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Denmark/Makefile" ;;
++    "kppp/Rules/Estonia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Estonia/Makefile" ;;
++    "kppp/Rules/Finland/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Finland/Makefile" ;;
++    "kppp/Rules/France/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/France/Makefile" ;;
++    "kppp/Rules/Germany/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Germany/Makefile" ;;
++    "kppp/Rules/Greece/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Greece/Makefile" ;;
++    "kppp/Rules/HongKong/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/HongKong/Makefile" ;;
++    "kppp/Rules/Hungary/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Hungary/Makefile" ;;
++    "kppp/Rules/Iceland/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Iceland/Makefile" ;;
++    "kppp/Rules/India/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/India/Makefile" ;;
++    "kppp/Rules/Indonesia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Indonesia/Makefile" ;;
++    "kppp/Rules/Ireland/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Ireland/Makefile" ;;
++    "kppp/Rules/Israel/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Israel/Makefile" ;;
++    "kppp/Rules/Italy/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Italy/Makefile" ;;
++    "kppp/Rules/Jamaica/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Jamaica/Makefile" ;;
++    "kppp/Rules/Japan/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Japan/Makefile" ;;
++    "kppp/Rules/Kazakhstan/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Kazakhstan/Makefile" ;;
++    "kppp/Rules/Luxembourg/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Luxembourg/Makefile" ;;
++    "kppp/Rules/Macedonia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Macedonia/Makefile" ;;
++    "kppp/Rules/Malaysia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Malaysia/Makefile" ;;
++    "kppp/Rules/Netherlands/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Netherlands/Makefile" ;;
++    "kppp/Rules/Norway/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Norway/Makefile" ;;
++    "kppp/Rules/Poland/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Poland/Makefile" ;;
++    "kppp/Rules/Portugal/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Portugal/Makefile" ;;
++    "kppp/Rules/Romania/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Romania/Makefile" ;;
++    "kppp/Rules/Russia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Russia/Makefile" ;;
++    "kppp/Rules/Singapore/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Singapore/Makefile" ;;
++    "kppp/Rules/Slovakia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Slovakia/Makefile" ;;
++    "kppp/Rules/Slovenia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Slovenia/Makefile" ;;
++    "kppp/Rules/SouthAfrica/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/SouthAfrica/Makefile" ;;
++    "kppp/Rules/SouthAfrika/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/SouthAfrika/Makefile" ;;
++    "kppp/Rules/Spain/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Spain/Makefile" ;;
++    "kppp/Rules/Sweden/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Sweden/Makefile" ;;
++    "kppp/Rules/Switzerland/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Switzerland/Makefile" ;;
++    "kppp/Rules/Turkey/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Turkey/Makefile" ;;
++    "kppp/Rules/Ukraine/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Ukraine/Makefile" ;;
++    "kppp/Rules/United_Kingdom/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/United_Kingdom/Makefile" ;;
++    "kppp/Rules/Uruguay/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Uruguay/Makefile" ;;
++    "kppp/Rules/Yugoslavia/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/Rules/Yugoslavia/Makefile" ;;
++    "kppp/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/icons/Makefile" ;;
++    "kppp/logview/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/logview/Makefile" ;;
++    "kppp/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES kppp/pixmaps/Makefile" ;;
++    "krdc/Makefile") CONFIG_FILES="$CONFIG_FILES krdc/Makefile" ;;
++    "krdc/rdp/Makefile") CONFIG_FILES="$CONFIG_FILES krdc/rdp/Makefile" ;;
++    "krdc/vnc/Makefile") CONFIG_FILES="$CONFIG_FILES krdc/vnc/Makefile" ;;
++    "krfb/Makefile") CONFIG_FILES="$CONFIG_FILES krfb/Makefile" ;;
++    "krfb/kcm_krfb/Makefile") CONFIG_FILES="$CONFIG_FILES krfb/kcm_krfb/Makefile" ;;
++    "krfb/kinetd/Makefile") CONFIG_FILES="$CONFIG_FILES krfb/kinetd/Makefile" ;;
++    "krfb/krfb/Makefile") CONFIG_FILES="$CONFIG_FILES krfb/krfb/Makefile" ;;
++    "krfb/krfb_httpd/Makefile") CONFIG_FILES="$CONFIG_FILES krfb/krfb_httpd/Makefile" ;;
++    "krfb/libvncserver/Makefile") CONFIG_FILES="$CONFIG_FILES krfb/libvncserver/Makefile" ;;
++    "krfb/srvloc/Makefile") CONFIG_FILES="$CONFIG_FILES krfb/srvloc/Makefile" ;;
++    "ksirc/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/Makefile" ;;
++    "ksirc/KSOpenkSirc/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/KSOpenkSirc/Makefile" ;;
++    "ksirc/KSPrefs/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/KSPrefs/Makefile" ;;
++    "ksirc/KSProgress/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/KSProgress/Makefile" ;;
++    "ksirc/KSTicker/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/KSTicker/Makefile" ;;
++    "ksirc/icons/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/icons/Makefile" ;;
++    "ksirc/img/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/img/Makefile" ;;
++    "ksirc/img/emoticons/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/img/emoticons/Makefile" ;;
++    "ksirc/puke/Makefile") CONFIG_FILES="$CONFIG_FILES ksirc/puke/Makefile" ;;
++    "ktalkd/Makefile") CONFIG_FILES="$CONFIG_FILES ktalkd/Makefile" ;;
++    "ktalkd/kcmktalkd/Makefile") CONFIG_FILES="$CONFIG_FILES ktalkd/kcmktalkd/Makefile" ;;
++    "ktalkd/ktalkd/Makefile") CONFIG_FILES="$CONFIG_FILES ktalkd/ktalkd/Makefile" ;;
++    "ktalkd/ktalkd/machines/Makefile") CONFIG_FILES="$CONFIG_FILES ktalkd/ktalkd/machines/Makefile" ;;
++    "ktalkd/ktalkdlg/Makefile") CONFIG_FILES="$CONFIG_FILES ktalkd/ktalkdlg/Makefile" ;;
++    "ktalkd/mail.local/Makefile") CONFIG_FILES="$CONFIG_FILES ktalkd/mail.local/Makefile" ;;
++    "lanbrowsing/Makefile") CONFIG_FILES="$CONFIG_FILES lanbrowsing/Makefile" ;;
++    "lanbrowsing/kcmlisa/Makefile") CONFIG_FILES="$CONFIG_FILES lanbrowsing/kcmlisa/Makefile" ;;
++    "lanbrowsing/kio_lan/Makefile") CONFIG_FILES="$CONFIG_FILES lanbrowsing/kio_lan/Makefile" ;;
++    "lanbrowsing/lisa/Makefile") CONFIG_FILES="$CONFIG_FILES lanbrowsing/lisa/Makefile" ;;
++    "librss/Makefile") CONFIG_FILES="$CONFIG_FILES librss/Makefile" ;;
++    "wifi/Makefile") CONFIG_FILES="$CONFIG_FILES wifi/Makefile" ;;
++    "wifi/kcmwifi/Makefile") CONFIG_FILES="$CONFIG_FILES wifi/kcmwifi/Makefile" ;;
++    "wifi/kwireless/Makefile") CONFIG_FILES="$CONFIG_FILES wifi/kwireless/Makefile" ;;
++    "wifi/locations/Makefile") CONFIG_FILES="$CONFIG_FILES wifi/locations/Makefile" ;;
++    "wifi/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES wifi/pixmaps/Makefile" ;;
++
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
++
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+@@ -45957,590 +46645,782 @@
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  tmp=
++  trap 'exit_status=$?
++  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=./confstat$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
++  tmp=./conf$$-$RANDOM
++  (umask 077 && mkdir "$tmp")
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-
+ #
+-# CONFIG_FILES section.
++# Set up the sed scripts for CONFIG_FILES section.
+ #
+ 
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s, at SHELL@,$SHELL,;t t
+-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s, at exec_prefix@,$exec_prefix,;t t
+-s, at prefix@,$prefix,;t t
+-s, at program_transform_name@,$program_transform_name,;t t
+-s, at bindir@,$bindir,;t t
+-s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
+-s, at datadir@,$datadir,;t t
+-s, at sysconfdir@,$sysconfdir,;t t
+-s, at sharedstatedir@,$sharedstatedir,;t t
+-s, at localstatedir@,$localstatedir,;t t
+-s, at libdir@,$libdir,;t t
+-s, at includedir@,$includedir,;t t
+-s, at oldincludedir@,$oldincludedir,;t t
+-s, at infodir@,$infodir,;t t
+-s, at mandir@,$mandir,;t t
+-s, at build_alias@,$build_alias,;t t
+-s, at host_alias@,$host_alias,;t t
+-s, at target_alias@,$target_alias,;t t
+-s, at DEFS@,$DEFS,;t t
+-s, at ECHO_C@,$ECHO_C,;t t
+-s, at ECHO_N@,$ECHO_N,;t t
+-s, at ECHO_T@,$ECHO_T,;t t
+-s, at LIBS@,$LIBS,;t t
+-s, at build@,$build,;t t
+-s, at build_cpu@,$build_cpu,;t t
+-s, at build_vendor@,$build_vendor,;t t
+-s, at build_os@,$build_os,;t t
+-s, at host@,$host,;t t
+-s, at host_cpu@,$host_cpu,;t t
+-s, at host_vendor@,$host_vendor,;t t
+-s, at host_os@,$host_os,;t t
+-s, at target@,$target,;t t
+-s, at target_cpu@,$target_cpu,;t t
+-s, at target_vendor@,$target_vendor,;t t
+-s, at target_os@,$target_os,;t t
+-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+-s, at CYGPATH_W@,$CYGPATH_W,;t t
+-s, at PACKAGE@,$PACKAGE,;t t
+-s, at VERSION@,$VERSION,;t t
+-s, at ACLOCAL@,$ACLOCAL,;t t
+-s, at AUTOCONF@,$AUTOCONF,;t t
+-s, at AUTOMAKE@,$AUTOMAKE,;t t
+-s, at AUTOHEADER@,$AUTOHEADER,;t t
+-s, at MAKEINFO@,$MAKEINFO,;t t
+-s, at install_sh@,$install_sh,;t t
+-s, at STRIP@,$STRIP,;t t
+-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s, at mkdir_p@,$mkdir_p,;t t
+-s, at AWK@,$AWK,;t t
+-s, at SET_MAKE@,$SET_MAKE,;t t
+-s, at am__leading_dot@,$am__leading_dot,;t t
+-s, at AMTAR@,$AMTAR,;t t
+-s, at am__tar@,$am__tar,;t t
+-s, at am__untar@,$am__untar,;t t
+-s, at KDECONFIG@,$KDECONFIG,;t t
+-s, at kde_libs_prefix@,$kde_libs_prefix,;t t
+-s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
+-s, at CONF_FILES@,$CONF_FILES,;t t
+-s, at CC@,$CC,;t t
+-s, at CFLAGS@,$CFLAGS,;t t
+-s, at LDFLAGS@,$LDFLAGS,;t t
+-s, at CPPFLAGS@,$CPPFLAGS,;t t
+-s, at ac_ct_CC@,$ac_ct_CC,;t t
+-s, at EXEEXT@,$EXEEXT,;t t
+-s, at OBJEXT@,$OBJEXT,;t t
+-s, at DEPDIR@,$DEPDIR,;t t
+-s, at am__include@,$am__include,;t t
+-s, at am__quote@,$am__quote,;t t
+-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s, at CCDEPMODE@,$CCDEPMODE,;t t
+-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s, at CPP@,$CPP,;t t
+-s, at CXX@,$CXX,;t t
+-s, at CXXFLAGS@,$CXXFLAGS,;t t
+-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
+-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
+-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+-s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
+-s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
+-s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
+-s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
+-s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
+-s, at USE_RTTI@,$USE_RTTI,;t t
+-s, at CXXCPP@,$CXXCPP,;t t
+-s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
+-s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
+-s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
+-s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
+-s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
+-s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
+-s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
+-s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
+-s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
+-s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
+-s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
+-s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
+-s, at EGREP@,$EGREP,;t t
+-s, at LN_S@,$LN_S,;t t
+-s, at ECHO@,$ECHO,;t t
+-s, at AR@,$AR,;t t
+-s, at ac_ct_AR@,$ac_ct_AR,;t t
+-s, at RANLIB@,$RANLIB,;t t
+-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s, at F77@,$F77,;t t
+-s, at FFLAGS@,$FFLAGS,;t t
+-s, at ac_ct_F77@,$ac_ct_F77,;t t
+-s, at LIBTOOL@,$LIBTOOL,;t t
+-s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
+-s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
+-s, at MSGFMT@,$MSGFMT,;t t
+-s, at GMSGFMT@,$GMSGFMT,;t t
+-s, at XGETTEXT@,$XGETTEXT,;t t
+-s, at LIBUTIL@,$LIBUTIL,;t t
+-s, at LIBCOMPAT@,$LIBCOMPAT,;t t
+-s, at LIBCRYPT@,$LIBCRYPT,;t t
+-s, at LIBRESOLV@,$LIBRESOLV,;t t
+-s, at LIB_POLL@,$LIB_POLL,;t t
+-s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
+-s, at LIBSOCKET@,$LIBSOCKET,;t t
+-s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+-s, at LIBUCB@,$LIBUCB,;t t
+-s, at LIBDL@,$LIBDL,;t t
+-s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
+-s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
+-s, at include_x11_TRUE@,$include_x11_TRUE,;t t
+-s, at include_x11_FALSE@,$include_x11_FALSE,;t t
+-s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
+-s, at LIB_X11@,$LIB_X11,;t t
+-s, at LIB_XRENDER@,$LIB_XRENDER,;t t
+-s, at LIBSM@,$LIBSM,;t t
+-s, at X_INCLUDES@,$X_INCLUDES,;t t
+-s, at X_LDFLAGS@,$X_LDFLAGS,;t t
+-s, at x_includes@,$x_includes,;t t
+-s, at x_libraries@,$x_libraries,;t t
+-s, at QTE_NORTTI@,$QTE_NORTTI,;t t
+-s, at LIB_XEXT@,$LIB_XEXT,;t t
+-s, at LIBPTHREAD@,$LIBPTHREAD,;t t
+-s, at USE_THREADS@,$USE_THREADS,;t t
+-s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
+-s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
+-s, at USER_INCLUDES@,$USER_INCLUDES,;t t
+-s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
+-s, at LIBZ@,$LIBZ,;t t
+-s, at LIBPNG@,$LIBPNG,;t t
+-s, at LIBJPEG@,$LIBJPEG,;t t
+-s, at qt_libraries@,$qt_libraries,;t t
+-s, at qt_includes@,$qt_includes,;t t
+-s, at QT_INCLUDES@,$QT_INCLUDES,;t t
+-s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
+-s, at PERL@,$PERL,;t t
+-s, at MOC@,$MOC,;t t
+-s, at UIC@,$UIC,;t t
+-s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
+-s, at LIB_QPE@,$LIB_QPE,;t t
+-s, at kde_qtver@,$kde_qtver,;t t
+-s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
+-s, at KDE_RPATH@,$KDE_RPATH,;t t
+-s, at X_RPATH@,$X_RPATH,;t t
+-s, at kde_libraries@,$kde_libraries,;t t
+-s, at kde_includes@,$kde_includes,;t t
+-s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
+-s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
+-s, at all_includes@,$all_includes,;t t
+-s, at all_libraries@,$all_libraries,;t t
+-s, at AUTODIRS@,$AUTODIRS,;t t
+-s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
+-s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
+-s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
+-s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
+-s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
+-s, at DCOPIDLNG@,$DCOPIDLNG,;t t
+-s, at DCOPIDL@,$DCOPIDL,;t t
+-s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
+-s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
+-s, at MCOPIDL@,$MCOPIDL,;t t
+-s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
+-s, at MEINPROC@,$MEINPROC,;t t
+-s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
+-s, at XMLLINT@,$XMLLINT,;t t
+-s, at kde_htmldir@,$kde_htmldir,;t t
+-s, at kde_appsdir@,$kde_appsdir,;t t
+-s, at kde_icondir@,$kde_icondir,;t t
+-s, at kde_sounddir@,$kde_sounddir,;t t
+-s, at kde_datadir@,$kde_datadir,;t t
+-s, at kde_locale@,$kde_locale,;t t
+-s, at kde_confdir@,$kde_confdir,;t t
+-s, at kde_kcfgdir@,$kde_kcfgdir,;t t
+-s, at kde_mimedir@,$kde_mimedir,;t t
+-s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
+-s, at kde_bindir@,$kde_bindir,;t t
+-s, at xdg_appsdir@,$xdg_appsdir,;t t
+-s, at xdg_menudir@,$xdg_menudir,;t t
+-s, at xdg_directorydir@,$xdg_directorydir,;t t
+-s, at kde_templatesdir@,$kde_templatesdir,;t t
+-s, at kde_servicesdir@,$kde_servicesdir,;t t
+-s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
+-s, at kde_moduledir@,$kde_moduledir,;t t
+-s, at kdeinitdir@,$kdeinitdir,;t t
+-s, at kde_styledir@,$kde_styledir,;t t
+-s, at kde_widgetdir@,$kde_widgetdir,;t t
+-s, at LIB_KDED@,$LIB_KDED,;t t
+-s, at LIB_KDECORE@,$LIB_KDECORE,;t t
+-s, at LIB_KDEUI@,$LIB_KDEUI,;t t
+-s, at LIB_KIO@,$LIB_KIO,;t t
+-s, at LIB_KJS@,$LIB_KJS,;t t
+-s, at LIB_SMB@,$LIB_SMB,;t t
+-s, at LIB_KAB@,$LIB_KAB,;t t
+-s, at LIB_KABC@,$LIB_KABC,;t t
+-s, at LIB_KHTML@,$LIB_KHTML,;t t
+-s, at LIB_KSPELL@,$LIB_KSPELL,;t t
+-s, at LIB_KPARTS@,$LIB_KPARTS,;t t
+-s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
+-s, at LIB_KUTILS@,$LIB_KUTILS,;t t
+-s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
+-s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
+-s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
+-s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
+-s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
+-s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
+-s, at LIB_KFILE@,$LIB_KFILE,;t t
+-s, at LIB_KFM@,$LIB_KFM,;t t
+-s, at QTDOCDIR@,$QTDOCDIR,;t t
+-s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
+-s, at DOXYGEN@,$DOXYGEN,;t t
+-s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
+-s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
+-s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
+-s, at LIB_SLP@,$LIB_SLP,;t t
+-s, at GLINC@,$GLINC,;t t
+-s, at GLLIB@,$GLLIB,;t t
+-s, at include_smpppdcs_TRUE@,$include_smpppdcs_TRUE,;t t
+-s, at include_smpppdcs_FALSE@,$include_smpppdcs_FALSE,;t t
+-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
+-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
+-s, at LIBXSLT_RPATH@,$LIBXSLT_RPATH,;t t
+-s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
+-s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
+-s, at LIBXML_RPATH@,$LIBXML_RPATH,;t t
+-s, at KOPETE_INCLUDES@,$KOPETE_INCLUDES,;t t
+-s, at KOPETE_COMPAT_INCLUDES@,$KOPETE_COMPAT_INCLUDES,;t t
+-s, at LIB_KOPETECOMPAT@,$LIB_KOPETECOMPAT,;t t
+-s, at LIB_XSS@,$LIB_XSS,;t t
+-s, at include_motionautoaway_TRUE@,$include_motionautoaway_TRUE,;t t
+-s, at include_motionautoaway_FALSE@,$include_motionautoaway_FALSE,;t t
+-s, at XMMS_LIBS@,$XMMS_LIBS,;t t
+-s, at XMMS_LDFLAGS@,$XMMS_LDFLAGS,;t t
+-s, at XMMS_INCLUDES@,$XMMS_INCLUDES,;t t
+-s, at LIBGG_INCLUDES@,$LIBGG_INCLUDES,;t t
+-s, at LIBGG_LIBS@,$LIBGG_LIBS,;t t
+-s, at COMPILE_GADU@,$COMPILE_GADU,;t t
+-s, at include_gadu_TRUE@,$include_gadu_TRUE,;t t
+-s, at include_gadu_FALSE@,$include_gadu_FALSE,;t t
+-s, at include_libggcopy_TRUE@,$include_libggcopy_TRUE,;t t
+-s, at include_libggcopy_FALSE@,$include_libggcopy_FALSE,;t t
+-s, at SSL_INCLUDES@,$SSL_INCLUDES,;t t
+-s, at SSL_LDFLAGS@,$SSL_LDFLAGS,;t t
+-s, at LIBSSL@,$LIBSSL,;t t
+-s, at include_jabber_TRUE@,$include_jabber_TRUE,;t t
+-s, at include_jabber_FALSE@,$include_jabber_FALSE,;t t
+-s, at IDN_LDFLAGS@,$IDN_LDFLAGS,;t t
+-s, at IDN_CPPFLAGS@,$IDN_CPPFLAGS,;t t
+-s, at IDN_LIBS@,$IDN_LIBS,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at MEANWHILE_CFLAGS@,$MEANWHILE_CFLAGS,;t t
+-s, at MEANWHILE_LIBS@,$MEANWHILE_LIBS,;t t
+-s, at GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
+-s, at GLIB_LIBS@,$GLIB_LIBS,;t t
+-s, at include_meanwhile_TRUE@,$include_meanwhile_TRUE,;t t
+-s, at include_meanwhile_FALSE@,$include_meanwhile_FALSE,;t t
+-s, at include_testbed_TRUE@,$include_testbed_TRUE,;t t
+-s, at include_testbed_FALSE@,$include_testbed_FALSE,;t t
+-s, at include_msn_webcam_TRUE@,$include_msn_webcam_TRUE,;t t
+-s, at include_msn_webcam_FALSE@,$include_msn_webcam_FALSE,;t t
+-s, at YAHOO2_VERSION@,$YAHOO2_VERSION,;t t
+-s, at SAMPLE_CLIENT_TRUE@,$SAMPLE_CLIENT_TRUE,;t t
+-s, at SAMPLE_CLIENT_FALSE@,$SAMPLE_CLIENT_FALSE,;t t
+-s, at YAHOOPKGREQ@,$YAHOOPKGREQ,;t t
+-s, at LIBXF86VIDMODE@,$LIBXF86VIDMODE,;t t
+-s, at COMPILE_GETIFADDRS@,$COMPILE_GETIFADDRS,;t t
+-s, at KDE_INSTALLED_TRUE@,$KDE_INSTALLED_TRUE,;t t
+-s, at KDE_INSTALLED_FALSE@,$KDE_INSTALLED_FALSE,;t t
+-s, at LIBBSD@,$LIBBSD,;t t
+-s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
+-s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
+-s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
+-s, at filesharing_SUBDIR_included_TRUE@,$filesharing_SUBDIR_included_TRUE,;t t
+-s, at filesharing_SUBDIR_included_FALSE@,$filesharing_SUBDIR_included_FALSE,;t t
+-s, at kdict_SUBDIR_included_TRUE@,$kdict_SUBDIR_included_TRUE,;t t
+-s, at kdict_SUBDIR_included_FALSE@,$kdict_SUBDIR_included_FALSE,;t t
+-s, at kdnssd_SUBDIR_included_TRUE@,$kdnssd_SUBDIR_included_TRUE,;t t
+-s, at kdnssd_SUBDIR_included_FALSE@,$kdnssd_SUBDIR_included_FALSE,;t t
+-s, at kfile_plugins_SUBDIR_included_TRUE@,$kfile_plugins_SUBDIR_included_TRUE,;t t
+-s, at kfile_plugins_SUBDIR_included_FALSE@,$kfile_plugins_SUBDIR_included_FALSE,;t t
+-s, at kget_SUBDIR_included_TRUE@,$kget_SUBDIR_included_TRUE,;t t
+-s, at kget_SUBDIR_included_FALSE@,$kget_SUBDIR_included_FALSE,;t t
+-s, at kopete_SUBDIR_included_TRUE@,$kopete_SUBDIR_included_TRUE,;t t
+-s, at kopete_SUBDIR_included_FALSE@,$kopete_SUBDIR_included_FALSE,;t t
+-s, at kpf_SUBDIR_included_TRUE@,$kpf_SUBDIR_included_TRUE,;t t
+-s, at kpf_SUBDIR_included_FALSE@,$kpf_SUBDIR_included_FALSE,;t t
+-s, at kppp_SUBDIR_included_TRUE@,$kppp_SUBDIR_included_TRUE,;t t
+-s, at kppp_SUBDIR_included_FALSE@,$kppp_SUBDIR_included_FALSE,;t t
+-s, at krdc_SUBDIR_included_TRUE@,$krdc_SUBDIR_included_TRUE,;t t
+-s, at krdc_SUBDIR_included_FALSE@,$krdc_SUBDIR_included_FALSE,;t t
+-s, at krfb_SUBDIR_included_TRUE@,$krfb_SUBDIR_included_TRUE,;t t
+-s, at krfb_SUBDIR_included_FALSE@,$krfb_SUBDIR_included_FALSE,;t t
+-s, at ksirc_SUBDIR_included_TRUE@,$ksirc_SUBDIR_included_TRUE,;t t
+-s, at ksirc_SUBDIR_included_FALSE@,$ksirc_SUBDIR_included_FALSE,;t t
+-s, at ktalkd_SUBDIR_included_TRUE@,$ktalkd_SUBDIR_included_TRUE,;t t
+-s, at ktalkd_SUBDIR_included_FALSE@,$ktalkd_SUBDIR_included_FALSE,;t t
+-s, at lanbrowsing_SUBDIR_included_TRUE@,$lanbrowsing_SUBDIR_included_TRUE,;t t
+-s, at lanbrowsing_SUBDIR_included_FALSE@,$lanbrowsing_SUBDIR_included_FALSE,;t t
+-s, at librss_SUBDIR_included_TRUE@,$librss_SUBDIR_included_TRUE,;t t
+-s, at librss_SUBDIR_included_FALSE@,$librss_SUBDIR_included_FALSE,;t t
+-s, at wifi_SUBDIR_included_TRUE@,$wifi_SUBDIR_included_TRUE,;t t
+-s, at wifi_SUBDIR_included_FALSE@,$wifi_SUBDIR_included_FALSE,;t t
+-s, at knewsticker_SUBDIR_included_TRUE@,$knewsticker_SUBDIR_included_TRUE,;t t
+-s, at knewsticker_SUBDIR_included_FALSE@,$knewsticker_SUBDIR_included_FALSE,;t t
+-s, at dcoprss_SUBDIR_included_TRUE@,$dcoprss_SUBDIR_included_TRUE,;t t
+-s, at dcoprss_SUBDIR_included_FALSE@,$dcoprss_SUBDIR_included_FALSE,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
++
++_ACEOF
++
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++target!$target$ac_delim
++target_cpu!$target_cpu$ac_delim
++target_vendor!$target_vendor$ac_delim
++target_os!$target_os$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++CYGPATH_W!$CYGPATH_W$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++ACLOCAL!$ACLOCAL$ac_delim
++AUTOCONF!$AUTOCONF$ac_delim
++AUTOMAKE!$AUTOMAKE$ac_delim
++AUTOHEADER!$AUTOHEADER$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++install_sh!$install_sh$ac_delim
++STRIP!$STRIP$ac_delim
++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
++mkdir_p!$mkdir_p$ac_delim
++AWK!$AWK$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
++KDECONFIG!$KDECONFIG$ac_delim
++kde_libs_prefix!$kde_libs_prefix$ac_delim
++kde_libs_htmldir!$kde_libs_htmldir$ac_delim
++CONF_FILES!$CONF_FILES$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DEPDIR!$DEPDIR$ac_delim
++am__include!$am__include$ac_delim
++am__quote!$am__quote$ac_delim
++AMDEP_TRUE!$AMDEP_TRUE$ac_delim
++AMDEP_FALSE!$AMDEP_FALSE$ac_delim
++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
++CCDEPMODE!$CCDEPMODE$ac_delim
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++CPP!$CPP$ac_delim
++CXX!$CXX$ac_delim
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+-fi # test -n "$CONFIG_FILES"
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
++WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
++HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
++unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
++unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
++USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
++USE_RTTI!$USE_RTTI$ac_delim
++CXXCPP!$CXXCPP$ac_delim
++NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
++NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
++ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
++LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
++LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
++KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
++KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
++KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
++KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
++KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
++KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
++KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
++RANLIB!$RANLIB$ac_delim
++F77!$F77$ac_delim
++FFLAGS!$FFLAGS$ac_delim
++ac_ct_F77!$ac_ct_F77$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
++KDE_PLUGIN!$KDE_PLUGIN$ac_delim
++KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++LIBUTIL!$LIBUTIL$ac_delim
++LIBCOMPAT!$LIBCOMPAT$ac_delim
++LIBCRYPT!$LIBCRYPT$ac_delim
++LIBRESOLV!$LIBRESOLV$ac_delim
++LIB_POLL!$LIB_POLL$ac_delim
++FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
++LIBSOCKET!$LIBSOCKET$ac_delim
++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
++LIBUCB!$LIBUCB$ac_delim
++LIBDL!$LIBDL$ac_delim
++KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
++KDE_USE_PIE!$KDE_USE_PIE$ac_delim
++include_x11_TRUE!$include_x11_TRUE$ac_delim
++include_x11_FALSE!$include_x11_FALSE$ac_delim
++XMKMF!$XMKMF$ac_delim
++X_PRE_LIBS!$X_PRE_LIBS$ac_delim
++LIB_X11!$LIB_X11$ac_delim
++LIB_XRENDER!$LIB_XRENDER$ac_delim
++LIBSM!$LIBSM$ac_delim
++X_INCLUDES!$X_INCLUDES$ac_delim
++X_LDFLAGS!$X_LDFLAGS$ac_delim
++x_includes!$x_includes$ac_delim
++x_libraries!$x_libraries$ac_delim
++QTE_NORTTI!$QTE_NORTTI$ac_delim
++LIB_XEXT!$LIB_XEXT$ac_delim
++LIBPTHREAD!$LIBPTHREAD$ac_delim
++USE_THREADS!$USE_THREADS$ac_delim
++KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
++KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
++USER_INCLUDES!$USER_INCLUDES$ac_delim
++USER_LDFLAGS!$USER_LDFLAGS$ac_delim
++LIBZ!$LIBZ$ac_delim
++LIBPNG!$LIBPNG$ac_delim
++LIBJPEG!$LIBJPEG$ac_delim
++qt_libraries!$qt_libraries$ac_delim
++qt_includes!$qt_includes$ac_delim
++QT_INCLUDES!$QT_INCLUDES$ac_delim
++QT_LDFLAGS!$QT_LDFLAGS$ac_delim
++PERL!$PERL$ac_delim
++MOC!$MOC$ac_delim
++UIC!$UIC$ac_delim
++UIC_TR!$UIC_TR$ac_delim
++LIB_QT!$LIB_QT$ac_delim
++LIB_QPE!$LIB_QPE$ac_delim
++kde_qtver!$kde_qtver$ac_delim
++KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
++KDE_RPATH!$KDE_RPATH$ac_delim
++X_RPATH!$X_RPATH$ac_delim
++kde_libraries!$kde_libraries$ac_delim
++kde_includes!$kde_includes$ac_delim
++KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
++KDE_INCLUDES!$KDE_INCLUDES$ac_delim
++all_includes!$all_includes$ac_delim
++all_libraries!$all_libraries$ac_delim
++AUTODIRS!$AUTODIRS$ac_delim
++include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
++include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
++MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
++KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
++KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++DCOPIDLNG!$DCOPIDLNG$ac_delim
++DCOPIDL!$DCOPIDL$ac_delim
++DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
++DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
++MCOPIDL!$MCOPIDL$ac_delim
++ARTSCCONFIG!$ARTSCCONFIG$ac_delim
++MEINPROC!$MEINPROC$ac_delim
++KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
++XMLLINT!$XMLLINT$ac_delim
++kde_htmldir!$kde_htmldir$ac_delim
++kde_appsdir!$kde_appsdir$ac_delim
++kde_icondir!$kde_icondir$ac_delim
++kde_sounddir!$kde_sounddir$ac_delim
++kde_datadir!$kde_datadir$ac_delim
++kde_locale!$kde_locale$ac_delim
++kde_confdir!$kde_confdir$ac_delim
++kde_kcfgdir!$kde_kcfgdir$ac_delim
++kde_mimedir!$kde_mimedir$ac_delim
++kde_wallpaperdir!$kde_wallpaperdir$ac_delim
++kde_bindir!$kde_bindir$ac_delim
++xdg_appsdir!$xdg_appsdir$ac_delim
++xdg_menudir!$xdg_menudir$ac_delim
++xdg_directorydir!$xdg_directorydir$ac_delim
++kde_templatesdir!$kde_templatesdir$ac_delim
++kde_servicesdir!$kde_servicesdir$ac_delim
++kde_servicetypesdir!$kde_servicetypesdir$ac_delim
++kde_moduledir!$kde_moduledir$ac_delim
++kdeinitdir!$kdeinitdir$ac_delim
++kde_styledir!$kde_styledir$ac_delim
++kde_widgetdir!$kde_widgetdir$ac_delim
++LIB_KDED!$LIB_KDED$ac_delim
++LIB_KDECORE!$LIB_KDECORE$ac_delim
++LIB_KDEUI!$LIB_KDEUI$ac_delim
++LIB_KIO!$LIB_KIO$ac_delim
++LIB_KJS!$LIB_KJS$ac_delim
++LIB_SMB!$LIB_SMB$ac_delim
++LIB_KAB!$LIB_KAB$ac_delim
++LIB_KABC!$LIB_KABC$ac_delim
++LIB_KHTML!$LIB_KHTML$ac_delim
++LIB_KSPELL!$LIB_KSPELL$ac_delim
++LIB_KPARTS!$LIB_KPARTS$ac_delim
++LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
++LIB_KUTILS!$LIB_KUTILS$ac_delim
++LIB_KDEPIM!$LIB_KDEPIM$ac_delim
++LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
++LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
++LIB_KDNSSD!$LIB_KDNSSD$ac_delim
++LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
++LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
++LIB_KFILE!$LIB_KFILE$ac_delim
++LIB_KFM!$LIB_KFM$ac_delim
++QTDOCDIR!$QTDOCDIR$ac_delim
++KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
++DOXYGEN!$DOXYGEN$ac_delim
++DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
++DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
++KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
++LIB_SLP!$LIB_SLP$ac_delim
++GLINC!$GLINC$ac_delim
++GLLIB!$GLLIB$ac_delim
++include_smpppdcs_TRUE!$include_smpppdcs_TRUE$ac_delim
++include_smpppdcs_FALSE!$include_smpppdcs_FALSE$ac_delim
++LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
++LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
++LIBXSLT_RPATH!$LIBXSLT_RPATH$ac_delim
++LIBXML_LIBS!$LIBXML_LIBS$ac_delim
++LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
++LIBXML_RPATH!$LIBXML_RPATH$ac_delim
++KOPETE_INCLUDES!$KOPETE_INCLUDES$ac_delim
++KOPETE_COMPAT_INCLUDES!$KOPETE_COMPAT_INCLUDES$ac_delim
++LIB_KOPETECOMPAT!$LIB_KOPETECOMPAT$ac_delim
++LIB_XSS!$LIB_XSS$ac_delim
++include_motionautoaway_TRUE!$include_motionautoaway_TRUE$ac_delim
++include_motionautoaway_FALSE!$include_motionautoaway_FALSE$ac_delim
++XMMS_LIBS!$XMMS_LIBS$ac_delim
++XMMS_LDFLAGS!$XMMS_LDFLAGS$ac_delim
++XMMS_INCLUDES!$XMMS_INCLUDES$ac_delim
++LIBGG_INCLUDES!$LIBGG_INCLUDES$ac_delim
++LIBGG_LIBS!$LIBGG_LIBS$ac_delim
++COMPILE_GADU!$COMPILE_GADU$ac_delim
++include_gadu_TRUE!$include_gadu_TRUE$ac_delim
++include_gadu_FALSE!$include_gadu_FALSE$ac_delim
++include_libggcopy_TRUE!$include_libggcopy_TRUE$ac_delim
++include_libggcopy_FALSE!$include_libggcopy_FALSE$ac_delim
++SSL_INCLUDES!$SSL_INCLUDES$ac_delim
++SSL_LDFLAGS!$SSL_LDFLAGS$ac_delim
++LIBSSL!$LIBSSL$ac_delim
++include_jabber_TRUE!$include_jabber_TRUE$ac_delim
++include_jabber_FALSE!$include_jabber_FALSE$ac_delim
++IDN_LDFLAGS!$IDN_LDFLAGS$ac_delim
++IDN_CPPFLAGS!$IDN_CPPFLAGS$ac_delim
++IDN_LIBS!$IDN_LIBS$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++MEANWHILE_CFLAGS!$MEANWHILE_CFLAGS$ac_delim
++MEANWHILE_LIBS!$MEANWHILE_LIBS$ac_delim
++GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
++GLIB_LIBS!$GLIB_LIBS$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++include_meanwhile_TRUE!$include_meanwhile_TRUE$ac_delim
++include_meanwhile_FALSE!$include_meanwhile_FALSE$ac_delim
++include_testbed_TRUE!$include_testbed_TRUE$ac_delim
++include_testbed_FALSE!$include_testbed_FALSE$ac_delim
++include_msn_webcam_TRUE!$include_msn_webcam_TRUE$ac_delim
++include_msn_webcam_FALSE!$include_msn_webcam_FALSE$ac_delim
++YAHOO2_VERSION!$YAHOO2_VERSION$ac_delim
++SAMPLE_CLIENT_TRUE!$SAMPLE_CLIENT_TRUE$ac_delim
++SAMPLE_CLIENT_FALSE!$SAMPLE_CLIENT_FALSE$ac_delim
++YAHOOPKGREQ!$YAHOOPKGREQ$ac_delim
++LIBXF86VIDMODE!$LIBXF86VIDMODE$ac_delim
++COMPILE_GETIFADDRS!$COMPILE_GETIFADDRS$ac_delim
++KDE_INSTALLED_TRUE!$KDE_INSTALLED_TRUE$ac_delim
++KDE_INSTALLED_FALSE!$KDE_INSTALLED_FALSE$ac_delim
++LIBBSD!$LIBBSD$ac_delim
++TOPSUBDIRS!$TOPSUBDIRS$ac_delim
++doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
++doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
++filesharing_SUBDIR_included_TRUE!$filesharing_SUBDIR_included_TRUE$ac_delim
++filesharing_SUBDIR_included_FALSE!$filesharing_SUBDIR_included_FALSE$ac_delim
++kdict_SUBDIR_included_TRUE!$kdict_SUBDIR_included_TRUE$ac_delim
++kdict_SUBDIR_included_FALSE!$kdict_SUBDIR_included_FALSE$ac_delim
++kdnssd_SUBDIR_included_TRUE!$kdnssd_SUBDIR_included_TRUE$ac_delim
++kdnssd_SUBDIR_included_FALSE!$kdnssd_SUBDIR_included_FALSE$ac_delim
++kfile_plugins_SUBDIR_included_TRUE!$kfile_plugins_SUBDIR_included_TRUE$ac_delim
++kfile_plugins_SUBDIR_included_FALSE!$kfile_plugins_SUBDIR_included_FALSE$ac_delim
++kget_SUBDIR_included_TRUE!$kget_SUBDIR_included_TRUE$ac_delim
++kget_SUBDIR_included_FALSE!$kget_SUBDIR_included_FALSE$ac_delim
++kopete_SUBDIR_included_TRUE!$kopete_SUBDIR_included_TRUE$ac_delim
++kopete_SUBDIR_included_FALSE!$kopete_SUBDIR_included_FALSE$ac_delim
++kpf_SUBDIR_included_TRUE!$kpf_SUBDIR_included_TRUE$ac_delim
++kpf_SUBDIR_included_FALSE!$kpf_SUBDIR_included_FALSE$ac_delim
++kppp_SUBDIR_included_TRUE!$kppp_SUBDIR_included_TRUE$ac_delim
++kppp_SUBDIR_included_FALSE!$kppp_SUBDIR_included_FALSE$ac_delim
++krdc_SUBDIR_included_TRUE!$krdc_SUBDIR_included_TRUE$ac_delim
++krdc_SUBDIR_included_FALSE!$krdc_SUBDIR_included_FALSE$ac_delim
++krfb_SUBDIR_included_TRUE!$krfb_SUBDIR_included_TRUE$ac_delim
++krfb_SUBDIR_included_FALSE!$krfb_SUBDIR_included_FALSE$ac_delim
++ksirc_SUBDIR_included_TRUE!$ksirc_SUBDIR_included_TRUE$ac_delim
++ksirc_SUBDIR_included_FALSE!$ksirc_SUBDIR_included_FALSE$ac_delim
++ktalkd_SUBDIR_included_TRUE!$ktalkd_SUBDIR_included_TRUE$ac_delim
++ktalkd_SUBDIR_included_FALSE!$ktalkd_SUBDIR_included_FALSE$ac_delim
++lanbrowsing_SUBDIR_included_TRUE!$lanbrowsing_SUBDIR_included_TRUE$ac_delim
++lanbrowsing_SUBDIR_included_FALSE!$lanbrowsing_SUBDIR_included_FALSE$ac_delim
++librss_SUBDIR_included_TRUE!$librss_SUBDIR_included_TRUE$ac_delim
++librss_SUBDIR_included_FALSE!$librss_SUBDIR_included_FALSE$ac_delim
++wifi_SUBDIR_included_TRUE!$wifi_SUBDIR_included_TRUE$ac_delim
++wifi_SUBDIR_included_FALSE!$wifi_SUBDIR_included_FALSE$ac_delim
++knewsticker_SUBDIR_included_TRUE!$knewsticker_SUBDIR_included_TRUE$ac_delim
++knewsticker_SUBDIR_included_FALSE!$knewsticker_SUBDIR_included_FALSE$ac_delim
++dcoprss_SUBDIR_included_TRUE!$dcoprss_SUBDIR_included_TRUE$ac_delim
++dcoprss_SUBDIR_included_FALSE!$dcoprss_SUBDIR_included_FALSE$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 54; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
+ 
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
+ _ACEOF
++
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[	 ]*\):*/\1/
++s/:*$//
++s/^[^=]*=[	 ]*$//
++}'
++fi
++
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++fi # test -n "$CONFIG_FILES"
++
++
++for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
++do
++  case $ac_tag in
++  :[FHLC]) ac_mode=$ac_tag; continue;;
++  esac
++  case $ac_mode$ac_tag in
++  :[FHL]*:*);;
++  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++   { (exit 1); exit 1; }; };;
++  :[FH]-) ac_tag=-:-;;
++  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++  esac
++  ac_save_IFS=$IFS
++  IFS=:
++  set x $ac_tag
++  IFS=$ac_save_IFS
++  shift
++  ac_file=$1
++  shift
++
++  case $ac_mode in
++  :L) ac_source=$1;;
++  :[FH])
++    ac_file_inputs=
++    for ac_f
++    do
++      case $ac_f in
++      -) ac_f="$tmp/stdin";;
++      *) # Look for the file first in the build tree, then in the source tree
++	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
++	 # because $ac_f cannot contain `:'.
++	 test -f "$ac_f" ||
++	   case $ac_f in
++	   [\\/$]*) false;;
++	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++	   esac ||
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++   { (exit 1); exit 1; }; };;
++      esac
++      ac_file_inputs="$ac_file_inputs $ac_f"
++    done
++
++    # Let's still pretend it is `configure' which instantiates (i.e., don't
++    # use $as_me), people would be surprised to read:
++    #    /* config.h.  Generated by config.status.  */
++    configure_input="Generated from "`IFS=:
++	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
++    if test x"$ac_file" != x-; then
++      configure_input="$ac_file.  $configure_input"
++      { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    fi
++
++    case $ac_tag in
++    *:-:* | *:-) cat >"$tmp/stdin";;
++    esac
++    ;;
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++  ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++  { as_dir="$ac_dir"
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+   ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+ 
++  case $ac_mode in
++  :F)
++  #
++  # CONFIG_FILE
++  #
+ 
+   case $INSTALL in
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++_ACEOF
+ 
 -  if test x"$ac_file" != x-; then
 -    { echo "$as_me:$LINENO: creating $ac_file" >&5
 -echo "$as_me: creating $ac_file" >&6;}
 -    rm -f "$ac_file"
 -  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -46537,6 +45955,12 @@
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-				     sed 's,.*/,,'` by configure."
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=
 +
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
++case `sed -n '/datarootdir/ {
++  p
++  q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p
++' $ac_file_inputs` in
++*datarootdir*) ;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  ac_datarootdir_hack='
++  s&@datadir@&$datadir&g
++  s&@docdir@&$docdir&g
++  s&@infodir@&$infodir&g
++  s&@localedir@&$localedir&g
++  s&@mandir@&$mandir&g
++    s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
  _ACEOF
++
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
+ $extrasub
+@@ -46548,248 +47428,122 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s, at configure_input@,$configure_input,;t t
+-s, at srcdir@,$ac_srcdir,;t t
+-s, at abs_srcdir@,$ac_abs_srcdir,;t t
+-s, at top_srcdir@,$ac_top_srcdir,;t t
+-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s, at builddir@,$ac_builddir,;t t
+-s, at abs_builddir@,$ac_abs_builddir,;t t
+-s, at top_builddir@,$ac_top_builddir,;t t
+-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s, at INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+-ac_dB='[	 ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
++s&@configure_input@&$configure_input&;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++$ac_datarootdir_hack
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
+ 
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  rm -f "$tmp/stdin"
+   case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++  -) cat "$tmp/out"; rm -f "$tmp/out";;
++  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+   esac
+-
+-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 # Do quote $f, to prevent DOS paths from being IFS'd.
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-  # Remove the trailing spaces.
+-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+-
++ ;;
++  :H)
++  #
++  # CONFIG_HEADER
++  #
+ _ACEOF
+ 
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h.  The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status.  Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless.  Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status.  If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless.  But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
++ac_dB='\\)[	 (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
+ 
+-# This sed command replaces #undef with comments.  This is necessary, for
++uniq confdefs.h |
++  sed -n '
++	t rset
++	:rset
++	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
++	t ok
++	d
++	:ok
++	s/[\\&,]/\\&/g
++	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++  ' >>conftest.defines
++
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments.  This is necessary, for
+ # example, in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[	 #]*u.*,/* & */,' >>conftest.defines
++
++# Break up conftest.defines:
++ac_max_sed_lines=50
++
++# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
++
++while :
++do
++  # Write a here document:
++    cat >>$CONFIG_STATUS <<_ACEOF
++    # First, check the format of the line:
++    cat >"\$tmp/defines.sed" <<\\CEOF
++/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
++/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
++b
++:def
+ _ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/defines.sed.
+-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#define' lines.
+-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+   echo 'CEOF
+-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++  grep . conftest.tail >/dev/null || break
+   rm -f conftest.defines
+   mv conftest.tail conftest.defines
+ done
+-rm -f conftest.defines
+-echo '  fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/undefs.sed.
+-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#undef'
+-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+-  rm -f conftest.undefs
+-  mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
++rm -f conftest.defines conftest.tail
+ 
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    echo "/* Generated by configure.  */" >$tmp/config.h
+-  else
+-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+-  fi
+-  cat $tmp/in >>$tmp/config.h
+-  rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++    echo "/* $configure_input  */" >"$tmp/config.h"
++    cat "$ac_result" >>"$tmp/config.h"
++    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_file" : 'X\(//\)[^/]' \| \
+-	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-      { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+       rm -f $ac_file
+-      mv $tmp/config.h $ac_file
++      mv "$tmp/config.h" $ac_file
+     fi
+   else
+-    cat $tmp/config.h
+-    rm -f $tmp/config.h
++    echo "/* $configure_input  */"
++    cat "$ac_result"
+   fi
++  rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+@@ -46800,135 +47554,39 @@
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+ $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X$ac_file : 'X\(//\)[^/]' \| \
+ 	 X$ac_file : 'X\(//\)$' \| \
+-	 X$ac_file : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+ echo X$ac_file |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+-	 X"$ac_dest" : 'X\(//\)$' \| \
+-	 X"$ac_dest" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+-  ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
++  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++  esac
+ 
+ 
+-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+-  case $ac_dest in
+-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++  case $ac_file$ac_mode in
++    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+   # Strip MF so we end up with the name of the file.
+   mf=`echo "$mf" | sed -e 's/:.*$//'`
+   # Check whether this is an Automake generated Makefile or not.
+@@ -46938,18 +47596,29 @@
+   # each Makefile.in and add a new line on top of each file to say so.
+   # So let's grep whole file.
+   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+-    dirpart=`(dirname "$mf") 2>/dev/null ||
++    dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+ 	 X"$mf" : 'X\(//\)$' \| \
+-	 X"$mf" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$mf" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   else
+     continue
+   fi
+@@ -46971,53 +47640,79 @@
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+-    fdir=`(dirname "$file") 2>/dev/null ||
++    fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$file" : 'X\(//\)[^/]' \| \
+ 	 X"$file" : 'X\(//\)$' \| \
+-	 X"$file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    { if $as_mkdir_p; then
+-    mkdir -p $dirpart/$fdir
+-  else
+-    as_dir=$dirpart/$fdir
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++    { as_dir=$dirpart/$fdir
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+     # echo "creating $dirpart/$file"
+     echo '# dummy' > "$dirpart/$file"
+   done
+ done
+  ;;
++
+   esac
+-done
+-_ACEOF
++done # for ac_tag
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
 --- configure.in
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.5.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdenetwork, "3.5.3") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -17343,7 +38832,15 @@
  dnl define the configure option that disables testbed protocol
 --- dcoprss/Makefile.in
 +++ dcoprss/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -169,6 +169,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -265,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17353,7 +38850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -308,6 +312,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -319,12 +324,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -343,10 +345,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -355,6 +360,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -431,12 +437,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17362,7 +38918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17374,52 +38930,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -821,18 +824,18 @@
- mocs: feedbrowser.moc
- 
- #>+ 3
--query.moc: $(srcdir)/query.h
--	$(MOC) $(srcdir)/query.h -o query.moc
-+xmlrpciface.moc: $(srcdir)/xmlrpciface.h
-+	$(MOC) $(srcdir)/xmlrpciface.h -o xmlrpciface.moc
- 
- #>+ 2
--mocs: query.moc
-+mocs: xmlrpciface.moc
- 
- #>+ 3
--xmlrpciface.moc: $(srcdir)/xmlrpciface.h
--	$(MOC) $(srcdir)/xmlrpciface.h -o xmlrpciface.moc
-+query.moc: $(srcdir)/query.h
-+	$(MOC) $(srcdir)/query.h -o query.moc
- 
- #>+ 2
--mocs: xmlrpciface.moc
-+mocs: query.moc
- 
- #>+ 3
- service.moc: $(srcdir)/service.h
-@@ -853,7 +856,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  feedbrowser.moc query.moc xmlrpciface.moc service.moc
-+	-rm -f  feedbrowser.moc xmlrpciface.moc query.moc service.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh 
-@@ -919,7 +922,7 @@
- 	rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
- 
- #>+ 11
--rssservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/service.cpp $(srcdir)/query.cpp $(srcdir)/document.cpp $(srcdir)/article.cpp $(srcdir)/xmlrpciface.cpp $(srcdir)/cache.cpp query_skel.cpp service_skel.cpp  xmlrpciface.moc query.moc service.moc
-+rssservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/service.cpp $(srcdir)/query.cpp $(srcdir)/document.cpp $(srcdir)/article.cpp $(srcdir)/xmlrpciface.cpp $(srcdir)/cache.cpp query_skel.cpp service_skel.cpp  query.moc xmlrpciface.moc service.moc
- 	@echo 'creating rssservice.all_cpp.cpp ...'; \
- 	rm -f rssservice.all_cpp.files rssservice.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
 --- doc/kcontrol/kcmktalkd/Makefile.in
 +++ doc/kcontrol/kcmktalkd/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17429,7 +38950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17438,7 +39018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17452,7 +39032,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/lanbrowser/Makefile.in
 +++ doc/kcontrol/lanbrowser/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17462,7 +39050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17471,7 +39118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17485,7 +39132,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/Makefile.in
 +++ doc/kcontrol/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17495,16 +39150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kcmktalkd lanbrowser
-+SUBDIRS =. lanbrowser kcmktalkd
- KDE_LANG = en
- KDE_DOCS = AUTO
- #>- all: all-recursive
-@@ -413,7 +416,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -413,7 +422,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17513,7 +39218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17527,7 +39232,15 @@
  mostlyclean-libtool:
 --- doc/kdict/Makefile.in
 +++ doc/kdict/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17537,7 +39250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17546,7 +39318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17558,42 +39330,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -582,7 +585,7 @@
- KDE_DIST=Makefile.in applet.png seteditor.png index.docbook mainwin.png Makefile.am conf.png index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) seteditor.png mainwin.png index.docbook applet.png conf.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) seteditor.png conf.png mainwin.png applet.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
-@@ -609,20 +612,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict
--	@for base in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
-+	@for base in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
-+	for base in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
-+	for file in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kget/Makefile.in
 +++ doc/kget/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17603,7 +39350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17612,7 +39418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17624,46 +39430,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -579,10 +582,10 @@
- .NOEXPORT:
- 
- #>+ 2
--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) 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
-@@ -609,20 +612,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget
--	@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 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 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
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17673,7 +39450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17682,7 +39518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17694,46 +39530,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -579,10 +582,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in kcmnewsticker-newssources.png kcontrol-icon.png about-icon.png newssite-icon.png knewsticker-childpanel.png knewsticker-icon.png knewsticker-kicker.png index.docbook checknews-icon.png kcmnewsticker-scrollerprefs.png preferences-icon.png kcmnewsticker-newssitedialog.png newarticle-icon.png kcmnewsticker-filters.png help-icon.png contextmenu.png kcmnewsticker-general.png Makefile.am index.cache.bz2 knewsticker-ownwindow.png oldarticle-icon.png 
-+KDE_DIST=kcmnewsticker-newssources.png Makefile.in kcontrol-icon.png about-icon.png newssite-icon.png knewsticker-childpanel.png knewsticker-icon.png knewsticker-kicker.png index.docbook kcmnewsticker-scrollerprefs.png checknews-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png kcmnewsticker-filters.png newarticle-icon.png help-icon.png contextmenu.png kcmnewsticker-general.png Makefile.am oldarticle-icon.png index.cache.bz2 knewsticker-ownwindow.png 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker
--	@for base in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
-+	@for base in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
-+	for base in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
-+	for file in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kopete/Makefile.in
 +++ doc/kopete/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17743,7 +39550,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17752,7 +39618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17764,42 +39630,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -582,7 +585,7 @@
- KDE_DIST=Makefile.in index.docbook menus.docbook Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook menus.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) menus.docbook index.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete
--	@for base in index.docbook menus.docbook ; do \
-+	@for base in menus.docbook index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook menus.docbook ; do \
-+	for base in menus.docbook index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook menus.docbook ; do \
-+	for file in menus.docbook index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kpf/Makefile.in
 +++ doc/kpf/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17809,7 +39650,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17818,7 +39718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17832,7 +39732,15 @@
  mostlyclean-libtool:
 --- doc/kppp/Makefile.in
 +++ doc/kppp/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17842,7 +39750,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17851,7 +39818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17863,42 +39830,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -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
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp
--	@for base in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
-+	@for base in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
-+	for base in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
-+	for file in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/krdc/Makefile.in
 +++ doc/krdc/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17908,7 +39850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17917,7 +39918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17929,46 +39930,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -579,10 +582,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=snapshot.png preferences_profilestab.eps krdc_window.png preferences_rdpdefaultstab.eps snapshot_vncentry.png authentication.eps snapshot_nobrowse.eps preferences_vncdefaultstab.png snapshot.eps index.docbook preferences_vncdefaultstab.eps krdc_window.eps preferences_profilestab.png preferences_rdpdefaultstab.png Makefile.in window_nofullscreen.png snapshot_nobrowse.png authentication.png snapshot_vncentry.eps snapshot_connectionspeed.png window_fullscreen.png Makefile.am close.png snapshot_connectionspeed.eps index.cache.bz2 
-+KDE_DIST=snapshot.png preferences_profilestab.eps krdc_window.png preferences_rdpdefaultstab.eps snapshot_vncentry.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png snapshot.eps index.docbook preferences_vncdefaultstab.eps krdc_window.eps preferences_profilestab.png preferences_rdpdefaultstab.png Makefile.in window_nofullscreen.png snapshot_nobrowse.png authentication.png snapshot_vncentry.eps snapshot_connectionspeed.png window_fullscreen.png Makefile.am close.png snapshot_connectionspeed.eps index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc
--	@for base in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
-+	@for base in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
-+	for base in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
-+	for file in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/krfb/Makefile.in
 +++ doc/krfb/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17978,7 +39950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17987,7 +40018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17999,46 +40030,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -579,10 +582,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=screenshot.png connection.eps configuration_network.png invitation_management.eps invitation_management.png configuration_access.png index.docbook personal_invitation.eps configuration_session.png configuration_session.eps configuration_network.eps Makefile.in configuration_access.eps screenshot.eps email_invitation.eps personal_invitation.png email_invitation.png Makefile.am connection.png index.cache.bz2 
-+KDE_DIST=screenshot.png connection.eps configuration_network.png invitation_management.eps invitation_management.png index.docbook configuration_access.png personal_invitation.eps configuration_session.png configuration_session.eps configuration_network.eps Makefile.in configuration_access.eps screenshot.eps email_invitation.eps personal_invitation.png email_invitation.png Makefile.am connection.png index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb
--	@for base in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
-+	@for base in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
-+	for base in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
-+	for file in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/ksirc/Makefile.in
 +++ doc/ksirc/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18048,7 +40050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18057,7 +40118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18071,7 +40132,15 @@
  mostlyclean-libtool:
 --- doc/ktalkd/Makefile.in
 +++ doc/ktalkd/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18081,7 +40150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18090,7 +40218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18104,7 +40232,15 @@
  mostlyclean-libtool:
 --- doc/kwifimanager/Makefile.in
 +++ doc/kwifimanager/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18114,7 +40250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18123,7 +40318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18137,7 +40332,15 @@
  mostlyclean-libtool:
 --- doc/lisa/Makefile.in
 +++ doc/lisa/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18147,7 +40350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18156,7 +40418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18170,7 +40432,15 @@
  mostlyclean-libtool:
 --- doc/Makefile.in
 +++ doc/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18180,14 +40450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,13 +410,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kpf krdc krfb kwifimanager kopete lisa knewsticker kget kppp ktalkd kcontrol ksirc kdict
-+SUBDIRS =. kpf kget kppp krdc krfb lisa knewsticker kdict ksirc kwifimanager kcontrol kopete ktalkd
- #>- all: all-recursive
- #>+ 1
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -413,7 +422,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18196,7 +40518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18210,7 +40532,15 @@
  mostlyclean-libtool:
 --- filesharing/advanced/kcm_sambaconf/Makefile.in
 +++ filesharing/advanced/kcm_sambaconf/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -260,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18220,7 +40550,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -303,6 +307,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -314,12 +319,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,10 +340,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -350,6 +355,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -426,12 +432,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -527,7 +536,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18229,7 +40618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -565,9 +574,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18241,47 +40630,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -879,18 +882,18 @@
- mocs: kcmsambaconf.moc
- 
- #>+ 3
--usertabimpl.moc: $(srcdir)/usertabimpl.h
--	$(MOC) $(srcdir)/usertabimpl.h -o usertabimpl.moc
-+sambafile.moc: $(srcdir)/sambafile.h
-+	$(MOC) $(srcdir)/sambafile.h -o sambafile.moc
- 
- #>+ 2
--mocs: usertabimpl.moc
-+mocs: sambafile.moc
- 
- #>+ 3
--sambafile.moc: $(srcdir)/sambafile.h
--	$(MOC) $(srcdir)/sambafile.h -o sambafile.moc
-+usertabimpl.moc: $(srcdir)/usertabimpl.h
-+	$(MOC) $(srcdir)/usertabimpl.h -o usertabimpl.moc
- 
- #>+ 2
--mocs: sambafile.moc
-+mocs: usertabimpl.moc
- 
- #>+ 3
- hiddenfileview.moc: $(srcdir)/hiddenfileview.h
-@@ -959,10 +962,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kcmsambaconf.moc usertabimpl.moc sambafile.moc hiddenfileview.moc sharedlgimpl.moc qmultichecklistitem.moc printerdlgimpl.moc smbconfconfigwidget.moc dictmanager.moc smbpasswdfile.moc filemodedlgimpl.moc
-+	-rm -f  kcmsambaconf.moc sambafile.moc usertabimpl.moc hiddenfileview.moc sharedlgimpl.moc qmultichecklistitem.moc printerdlgimpl.moc smbconfconfigwidget.moc dictmanager.moc smbpasswdfile.moc filemodedlgimpl.moc
- 
- #>+ 2
--KDE_DIST=groupselectdlg.ui.h konqinterface.ui groupselectdlg.ui hiddenfileview.h sambashare.h sambafile.h printerdlgimpl.h expertuserdlg.ui hi16-app-kcmsambaconf.png kcmsambaconf.desktop joindomaindlg.ui.h usertab.ui kcmsambaconf.h filemodedlg.ui userselectdlg.ui.h socketoptionsdlg.ui qmultichecklistitem.h common.h linuxpermissionchecker.h kcminterface.ui sharedlgimpl.h socketoptionsdlg.ui.h kcminterface.ui.h Makefile.in konqinterface.ui.h dictmanager.h kcmprinterdlg.ui share.ui.h share.ui smbpasswdfile.h joindomaindlg.ui kcmprinterdlg.ui.h passwd.h usertabimpl.h filemodedlgimpl.h usertab.ui.h smbconfconfigwidget.h Makefile.am userselectdlg.ui programmingconventions.txt 
-+KDE_DIST=groupselectdlg.ui.h konqinterface.ui groupselectdlg.ui hiddenfileview.h sambashare.h printerdlgimpl.h sambafile.h expertuserdlg.ui hi16-app-kcmsambaconf.png kcmsambaconf.desktop joindomaindlg.ui.h usertab.ui kcmsambaconf.h filemodedlg.ui userselectdlg.ui.h socketoptionsdlg.ui qmultichecklistitem.h common.h linuxpermissionchecker.h kcminterface.ui sharedlgimpl.h socketoptionsdlg.ui.h kcminterface.ui.h Makefile.in konqinterface.ui.h dictmanager.h kcmprinterdlg.ui share.ui share.ui.h smbpasswdfile.h joindomaindlg.ui kcmprinterdlg.ui.h passwd.h usertabimpl.h filemodedlgimpl.h usertab.ui.h smbconfconfigwidget.h Makefile.am userselectdlg.ui programmingconventions.txt 
- 
- #>+ 13
- clean-ui:
 --- filesharing/advanced/Makefile.in
 +++ filesharing/advanced/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18291,7 +40650,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18300,7 +40718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18314,7 +40732,15 @@
  mostlyclean-libtool:
 --- filesharing/advanced/nfs/Makefile.in
 +++ filesharing/advanced/nfs/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -231,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18324,7 +40750,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -274,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -285,12 +290,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -309,10 +311,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -321,6 +326,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -447,7 +456,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18333,7 +40818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +494,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18347,7 +40832,15 @@
  clean-noinstLTLIBRARIES:
 --- filesharing/advanced/propsdlgplugin/Makefile.in
 +++ filesharing/advanced/propsdlgplugin/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -253,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18357,7 +40850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -296,6 +300,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -307,12 +312,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -331,10 +333,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -343,6 +348,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -419,12 +425,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18366,7 +40918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -509,9 +518,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18380,7 +40932,15 @@
  	@$(NORMAL_INSTALL)
 --- filesharing/Makefile.in
 +++ filesharing/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18390,7 +40950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18399,7 +41018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18413,7 +41032,15 @@
  mostlyclean-libtool:
 --- filesharing/simple/Makefile.in
 +++ filesharing/simple/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -248,6 +249,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18423,7 +41050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -291,6 +295,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -302,12 +307,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -326,10 +328,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -338,6 +343,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -414,12 +420,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -469,7 +478,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18432,7 +41118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -507,9 +516,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18446,7 +41132,15 @@
  	@$(NORMAL_INSTALL)
 --- kdict/applet/Makefile.in
 +++ kdict/applet/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -242,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18456,7 +41150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -285,6 +289,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -296,12 +301,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -320,10 +322,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -332,6 +337,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -408,12 +414,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -449,7 +458,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18465,7 +41218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -487,9 +496,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18479,7 +41232,15 @@
  	@$(NORMAL_INSTALL)
 --- kdict/Makefile.in
 +++ kdict/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -276,6 +277,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18489,7 +41250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -319,6 +323,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -330,12 +335,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,10 +356,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -366,6 +371,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -442,12 +448,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -503,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18498,7 +41318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18510,126 +41330,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1051,13 +1054,6 @@
- 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
- 
- #>+ 3
--sets.moc: $(srcdir)/sets.h
--	$(MOC) $(srcdir)/sets.h -o sets.moc
--
--#>+ 2
--mocs: sets.moc
--
--#>+ 3
- actions.moc: $(srcdir)/actions.h
- 	$(MOC) $(srcdir)/actions.h -o actions.moc
- 
-@@ -1065,25 +1061,18 @@
- mocs: actions.moc
- 
- #>+ 3
--options.moc: $(srcdir)/options.h
--	$(MOC) $(srcdir)/options.h -o options.moc
--
--#>+ 2
--mocs: options.moc
--
--#>+ 3
--queryview.moc: $(srcdir)/queryview.h
--	$(MOC) $(srcdir)/queryview.h -o queryview.moc
-+sets.moc: $(srcdir)/sets.h
-+	$(MOC) $(srcdir)/sets.h -o sets.moc
- 
- #>+ 2
--mocs: queryview.moc
-+mocs: sets.moc
- 
- #>+ 3
--toplevel.moc: $(srcdir)/toplevel.h
--	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-+options.moc: $(srcdir)/options.h
-+	$(MOC) $(srcdir)/options.h -o options.moc
- 
- #>+ 2
--mocs: toplevel.moc
-+mocs: options.moc
- 
- #>+ 3
- application.moc: $(srcdir)/application.h
-@@ -1106,6 +1095,20 @@
- #>+ 2
- mocs: dict.moc
- 
-+#>+ 3
-+queryview.moc: $(srcdir)/queryview.h
-+	$(MOC) $(srcdir)/queryview.h -o queryview.moc
-+
-+#>+ 2
-+mocs: queryview.moc
-+
-+#>+ 3
-+toplevel.moc: $(srcdir)/toplevel.h
-+	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-+
-+#>+ 2
-+mocs: toplevel.moc
-+
- #>+ 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=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)/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)/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
-@@ -1196,7 +1199,7 @@
- 
- 
- #>+ 11
--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
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18639,7 +41350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18648,7 +41418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18660,32 +41430,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -584,19 +587,19 @@
- 
- #>+ 15
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
- 	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions/define_clip.png
- 	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/define_clip.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-query_erase.png $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/query_erase.png
-+	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
- 	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions/define_clip.png
- 	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/define_clip.png
- 	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/query_erase.png
-+	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
- 
- #>+ 15
- force-reedit:
 --- kdnssd/ioslave/Makefile.in
 +++ kdnssd/ioslave/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18695,7 +41450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -452,7 +461,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18704,7 +41518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +499,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18716,18 +41530,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -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 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
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18737,7 +41550,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -450,7 +459,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18746,7 +41618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -488,9 +497,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18760,7 +41632,15 @@
  	@$(NORMAL_INSTALL)
 --- kdnssd/Makefile.in
 +++ kdnssd/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18770,7 +41650,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18779,7 +41718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18793,7 +41732,15 @@
  mostlyclean-libtool:
 --- kfile-plugins/Makefile.in
 +++ kfile-plugins/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18803,7 +41750,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18812,7 +41818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18826,7 +41832,15 @@
  mostlyclean-libtool:
 --- kfile-plugins/torrent/Makefile.in
 +++ kfile-plugins/torrent/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -247,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18836,7 +41850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -290,6 +294,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -301,12 +306,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,10 +327,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -337,6 +342,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -413,12 +419,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -459,7 +468,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18845,7 +41918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -497,9 +506,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18859,7 +41932,15 @@
  	@$(NORMAL_INSTALL)
 --- kget/icons/Makefile.in
 +++ kget/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18869,7 +41950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18878,7 +42018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18890,108 +42030,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -577,7 +580,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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:
-@@ -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
--	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.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_logwindow.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
- 	$(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_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-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_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
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
-+	$(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-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_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_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
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
- 	-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_timer.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.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_restart.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
-+	-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/tool_delay.png
--	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.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_pause.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
-+	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
- 
- #>+ 15
- force-reedit:
 --- kget/kget_plug_in/Makefile.in
 +++ kget/kget_plug_in/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -241,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19001,7 +42050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -284,6 +288,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -295,12 +300,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -319,10 +321,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -331,6 +336,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -407,12 +413,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -447,7 +456,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19010,7 +42118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +494,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19024,7 +42132,15 @@
  	@$(NORMAL_INSTALL)
 --- kget/Makefile.in
 +++ kget/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -187,6 +187,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -283,6 +284,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19034,7 +42150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -326,6 +330,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -337,12 +342,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,10 +363,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -373,6 +378,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -449,12 +455,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -524,7 +533,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19043,7 +42218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +571,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19055,121 +42230,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1071,18 +1074,18 @@
- mocs: dlgAdvanced.moc
- 
- #>+ 3
--docking.moc: $(srcdir)/docking.h
--	$(MOC) $(srcdir)/docking.h -o docking.moc
-+transfer.moc: $(srcdir)/transfer.h
-+	$(MOC) $(srcdir)/transfer.h -o transfer.moc
- 
- #>+ 2
--mocs: docking.moc
-+mocs: transfer.moc
- 
- #>+ 3
--transfer.moc: $(srcdir)/transfer.h
--	$(MOC) $(srcdir)/transfer.h -o transfer.moc
-+docking.moc: $(srcdir)/docking.h
-+	$(MOC) $(srcdir)/docking.h -o docking.moc
- 
- #>+ 2
--mocs: transfer.moc
-+mocs: docking.moc
- 
- #>+ 3
- slave.moc: $(srcdir)/slave.h
-@@ -1113,18 +1116,18 @@
- mocs: dlgSystem.moc
- 
- #>+ 3
--kmainwidget.moc: $(srcdir)/kmainwidget.h
--	$(MOC) $(srcdir)/kmainwidget.h -o kmainwidget.moc
-+dlgConnection.moc: $(srcdir)/dlgConnection.h
-+	$(MOC) $(srcdir)/dlgConnection.h -o dlgConnection.moc
- 
- #>+ 2
--mocs: kmainwidget.moc
-+mocs: dlgConnection.moc
- 
- #>+ 3
--dlgConnection.moc: $(srcdir)/dlgConnection.h
--	$(MOC) $(srcdir)/dlgConnection.h -o dlgConnection.moc
-+kmainwidget.moc: $(srcdir)/kmainwidget.h
-+	$(MOC) $(srcdir)/kmainwidget.h -o kmainwidget.moc
- 
- #>+ 2
--mocs: dlgConnection.moc
-+mocs: kmainwidget.moc
- 
- #>+ 3
- droptarget.moc: $(srcdir)/droptarget.h
-@@ -1163,7 +1166,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  dockindividual.moc logwindow.moc dlgAdvanced.moc docking.moc transfer.moc slave.moc dlgDirectories.moc transferlist.moc dlgSystem.moc kmainwidget.moc dlgConnection.moc droptarget.moc dlgLimits.moc dlgAutomation.moc dlgIndividual.moc dlgPreferences.moc
-+	-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=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
- 	@echo 'creating kget.all_cpp.cpp ...'; \
- 	rm -f kget.all_cpp.files kget.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
 --- kget/pics/Makefile.in
 +++ kget/pics/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19179,7 +42250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19188,7 +42318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +458,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19202,7 +42332,15 @@
  mostlyclean-libtool:
 --- kget/sounds/Makefile.in
 +++ kget/sounds/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19212,7 +42350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -406,7 +415,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19221,7 +42418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -444,9 +453,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19235,7 +42432,15 @@
  mostlyclean-libtool:
 --- knewsticker/common/Makefile.in
 +++ knewsticker/common/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -237,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19245,7 +42450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -280,6 +284,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -291,12 +296,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -315,10 +317,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -327,6 +332,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -403,12 +409,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -450,7 +459,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19254,7 +42518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -488,9 +497,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19268,7 +42532,15 @@
  clean-noinstLTLIBRARIES:
 --- knewsticker/knewstickerstub/Makefile.in
 +++ knewsticker/knewstickerstub/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -240,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19278,7 +42550,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -283,6 +287,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -294,12 +299,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -318,10 +320,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -330,6 +335,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -406,12 +412,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19287,7 +42618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19301,7 +42632,15 @@
  	@$(NORMAL_INSTALL)
 --- knewsticker/kntsrcfilepropsdlg/Makefile.in
 +++ knewsticker/kntsrcfilepropsdlg/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -244,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19311,7 +42650,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -287,6 +291,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -298,12 +303,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,10 +324,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -334,6 +339,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -410,12 +416,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -454,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19320,7 +42718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -492,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19334,7 +42732,15 @@
  	@$(NORMAL_INSTALL)
 --- knewsticker/Makefile.in
 +++ knewsticker/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -176,6 +176,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -272,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19344,7 +42750,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -315,6 +319,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -326,12 +331,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -438,12 +444,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -497,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19353,7 +42818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19365,77 +42830,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1032,18 +1035,18 @@
- mocs: newsscroller.moc
- 
- #>+ 3
--knewstickerconfig.moc: $(srcdir)/knewstickerconfig.h
--	$(MOC) $(srcdir)/knewstickerconfig.h -o knewstickerconfig.moc
-+knewsticker.moc: $(srcdir)/knewsticker.h
-+	$(MOC) $(srcdir)/knewsticker.h -o knewsticker.moc
- 
- #>+ 2
--mocs: knewstickerconfig.moc
-+mocs: knewsticker.moc
- 
- #>+ 3
--knewsticker.moc: $(srcdir)/knewsticker.h
--	$(MOC) $(srcdir)/knewsticker.h -o knewsticker.moc
-+knewstickerconfig.moc: $(srcdir)/knewstickerconfig.h
-+	$(MOC) $(srcdir)/knewstickerconfig.h -o knewstickerconfig.moc
- 
- #>+ 2
--mocs: knewsticker.moc
-+mocs: knewstickerconfig.moc
- 
- #>+ 3
- newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
-@@ -1054,10 +1057,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  newsscroller.moc knewstickerconfig.moc knewsticker.moc newssourcedlgimpl.moc
-+	-rm -f  newsscroller.moc knewsticker.moc knewstickerconfig.moc newssourcedlgimpl.moc
- 
- #>+ 2
--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:
-@@ -1079,17 +1082,17 @@
- 
- #>+ 13
- install-kde-icons:
-+	$(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)/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:
-@@ -1130,7 +1133,7 @@
- 
- 
- #>+ 11
--knewsticker_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/newsscroller.cpp $(srcdir)/knewsticker.cpp $(srcdir)/knewstickerconfig.cpp $(srcdir)/newssourcedlgimpl.cpp knewsticker_skel.cpp knewstickerconfigwidget.cpp newssourcedlg.cpp  knewstickerconfigwidget.moc knewsticker.moc knewstickerconfig.moc newsscroller.moc newssourcedlgimpl.moc newssourcedlg.moc
-+knewsticker_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/newsscroller.cpp $(srcdir)/knewsticker.cpp $(srcdir)/knewstickerconfig.cpp $(srcdir)/newssourcedlgimpl.cpp knewsticker_skel.cpp knewstickerconfigwidget.cpp newssourcedlg.cpp  knewstickerconfigwidget.moc knewstickerconfig.moc knewsticker.moc newsscroller.moc newssourcedlgimpl.moc newssourcedlg.moc
- 	@echo 'creating knewsticker_panelapplet_la.all_cpp.cpp ...'; \
- 	rm -f knewsticker_panelapplet_la.all_cpp.files knewsticker_panelapplet_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
 --- kopete/icons/Makefile.in
 +++ kopete/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19445,7 +42850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19454,7 +42918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19466,199 +42930,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -577,116 +580,116 @@
- .NOEXPORT:
- 
- #>+ 2
--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:
- 
- #>+ 105
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.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
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteaway.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions
--	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
- 	$(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
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.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)/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
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_online.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions
-+	$(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
-+	$(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-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
--	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
-+	$(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
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions
-+	$(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)/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
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteaway.png
--	-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/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/48x48/actions/kopeteavailable.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/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
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
-+	-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/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/kopeteaway.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
-+	-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)/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 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -235,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19668,7 +42950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -278,6 +282,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -289,12 +294,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -313,10 +315,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -325,6 +330,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -401,12 +407,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -443,7 +452,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19677,7 +43018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19691,7 +43032,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/kopete/addcontactwizard/Makefile.in
 +++ kopete/kopete/addcontactwizard/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -236,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19701,7 +43050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -279,6 +283,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -290,12 +295,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -314,10 +316,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -326,6 +331,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -402,12 +408,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19710,7 +43118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19724,7 +43132,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/kopete/chatwindow/Makefile.in
 +++ kopete/kopete/chatwindow/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -276,6 +277,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19734,7 +43150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -319,6 +323,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -330,12 +335,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,10 +356,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -366,6 +371,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -442,12 +448,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -499,7 +508,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19743,7 +43218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +546,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19755,57 +43230,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -922,11 +925,11 @@
- mocs: kopeteemailwindow.moc
- 
- #>+ 3
--chatmemberslistwidget.moc: $(srcdir)/chatmemberslistwidget.h
--	$(MOC) $(srcdir)/chatmemberslistwidget.h -o chatmemberslistwidget.moc
-+kopeteemoticonaction.moc: $(srcdir)/kopeteemoticonaction.h
-+	$(MOC) $(srcdir)/kopeteemoticonaction.h -o kopeteemoticonaction.moc
- 
- #>+ 2
--mocs: chatmemberslistwidget.moc
-+mocs: kopeteemoticonaction.moc
- 
- #>+ 3
- kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
-@@ -936,11 +939,11 @@
- mocs: kopetechatwindow.moc
- 
- #>+ 3
--kopeteemoticonaction.moc: $(srcdir)/kopeteemoticonaction.h
--	$(MOC) $(srcdir)/kopeteemoticonaction.h -o kopeteemoticonaction.moc
-+chatmemberslistwidget.moc: $(srcdir)/chatmemberslistwidget.h
-+	$(MOC) $(srcdir)/chatmemberslistwidget.h -o chatmemberslistwidget.moc
- 
- #>+ 2
--mocs: kopeteemoticonaction.moc
-+mocs: chatmemberslistwidget.moc
- 
- #>+ 8
- kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
-@@ -962,7 +965,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  krichtexteditpart.moc emoticonselector.moc chattexteditpart.moc chatmessagepart.moc chatview.moc kopeteemailwindow.moc chatmemberslistwidget.moc kopetechatwindow.moc kopeteemoticonaction.moc
-+	-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 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
--kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatmessagepart.cpp $(srcdir)/emoticonselector.cpp $(srcdir)/kopeteemoticonaction.cpp $(srcdir)/chattexteditpart.cpp $(srcdir)/krichtexteditpart.cpp $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp  krichtexteditpart.moc emoticonselector.moc chatmessagepart.moc chattexteditpart.moc chatview.moc kopeteemoticonaction.moc chatmemberslistwidget.moc kopetechatwindow.moc
-+kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatmessagepart.cpp $(srcdir)/emoticonselector.cpp $(srcdir)/kopeteemoticonaction.cpp $(srcdir)/chattexteditpart.cpp $(srcdir)/krichtexteditpart.cpp $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp  krichtexteditpart.moc emoticonselector.moc chatmessagepart.moc chattexteditpart.moc chatview.moc chatmemberslistwidget.moc kopeteemoticonaction.moc kopetechatwindow.moc
- 	@echo 'creating kopete_chatwindow_la.all_cpp.cpp ...'; \
- 	rm -f kopete_chatwindow_la.all_cpp.files kopete_chatwindow_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kopete_chatwindow_la.all_cpp.final; \
 --- kopete/kopete/config/accounts/Makefile.in
 +++ kopete/kopete/config/accounts/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -246,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19815,7 +43250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -289,6 +293,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -300,12 +305,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -324,10 +326,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -336,6 +341,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -412,12 +418,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -457,7 +466,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19824,7 +43318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -495,9 +504,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19838,7 +43332,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/kopete/config/appearance/Makefile.in
 +++ kopete/kopete/config/appearance/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -247,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19848,7 +43350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -290,6 +294,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -301,12 +306,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,10 +327,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -337,6 +342,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -413,12 +419,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -468,7 +477,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19857,7 +43418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -506,9 +515,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19871,7 +43432,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/kopete/config/avdevice/Makefile.in
 +++ kopete/kopete/config/avdevice/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -250,6 +251,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19881,7 +43450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -293,6 +297,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -304,12 +309,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -328,10 +330,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -340,6 +345,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -416,12 +422,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -473,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19890,7 +43518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19902,36 +43530,17 @@
  	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
-@@ -245,6 +245,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -245,6 +246,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19941,7 +43550,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -288,6 +292,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -299,12 +304,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -323,10 +325,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -335,6 +340,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -411,12 +417,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -461,7 +470,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19950,7 +43618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -499,9 +508,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19962,18 +43630,17 @@
  	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 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -248,6 +249,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19983,7 +43650,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -291,6 +295,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -302,12 +307,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -326,10 +328,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -338,6 +343,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -414,12 +420,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -463,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19992,7 +43718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20004,48 +43730,17 @@
  	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
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20055,7 +43750,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -20064,7 +43818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20078,7 +43832,15 @@
  mostlyclean-libtool:
 --- kopete/kopete/config/plugins/Makefile.in
 +++ kopete/kopete/config/plugins/Makefile.in
-@@ -228,6 +228,9 @@
+@@ -132,6 +132,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -228,6 +229,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20088,7 +43850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -271,6 +275,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -282,12 +287,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -306,10 +308,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -318,6 +323,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -394,12 +400,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -431,7 +440,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20097,7 +43918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -469,9 +478,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20111,7 +43932,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/kopete/contactlist/Makefile.in
 +++ kopete/kopete/contactlist/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -241,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20121,7 +43950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -284,6 +288,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -295,12 +300,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -319,10 +321,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -331,6 +336,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -407,12 +413,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -467,7 +476,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20130,7 +44018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -505,9 +514,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20142,72 +44030,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -746,18 +749,18 @@
- .NOEXPORT:
- 
- #>+ 3
--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: customnotificationprops.moc
-+mocs: kopetegrouplistaction.moc
- 
- #>+ 3
--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: kopetegrouplistaction.moc
-+mocs: customnotificationprops.moc
- 
- #>+ 3
- 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  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 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 
- 
- #>+ 8
- clean-ui:
 --- kopete/kopete/kconf_update/Makefile.in
 +++ kopete/kopete/kconf_update/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -267,6 +268,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20217,7 +44050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -310,6 +314,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -321,12 +326,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -357,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -433,12 +439,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -484,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20226,7 +44118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20240,7 +44132,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/kopete/Makefile.in
 +++ kopete/kopete/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -177,6 +177,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -273,6 +274,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20250,7 +44150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -316,6 +320,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -327,12 +332,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,10 +353,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -363,6 +368,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -439,12 +445,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -519,7 +528,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20259,7 +44218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -557,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20271,121 +44230,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1007,18 +1010,18 @@
- mocs: kopetewindow.moc
- 
- #>+ 3
--kopeteapplication.moc: $(srcdir)/kopeteapplication.h
--	$(MOC) $(srcdir)/kopeteapplication.h -o kopeteapplication.moc
-+kimifaceimpl.moc: $(srcdir)/kimifaceimpl.h
-+	$(MOC) $(srcdir)/kimifaceimpl.h -o kimifaceimpl.moc
- 
- #>+ 2
--mocs: kopeteapplication.moc
-+mocs: kimifaceimpl.moc
- 
- #>+ 3
--kimifaceimpl.moc: $(srcdir)/kimifaceimpl.h
--	$(MOC) $(srcdir)/kimifaceimpl.h -o kimifaceimpl.moc
-+kopeteapplication.moc: $(srcdir)/kopeteapplication.h
-+	$(MOC) $(srcdir)/kopeteapplication.h -o kopeteapplication.moc
- 
- #>+ 2
--mocs: kimifaceimpl.moc
-+mocs: kopeteapplication.moc
- 
- #>+ 3
- kopeteeditglobalidentitywidget.moc: $(srcdir)/kopeteeditglobalidentitywidget.h
-@@ -1043,10 +1046,10 @@
- 
- #>+ 3
- clean-metasources:
--	-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=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:
-@@ -1060,43 +1063,43 @@
- #>+ 40
- install-kde-icons:
- 	$(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)/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/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_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)/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_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)/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/16x16/mimetypes/kopete_emoticons.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)/hicolor/48x48/apps/kopete.png
- 
- #>+ 15
- force-reedit:
-@@ -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 $(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 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -255,6 +256,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20395,7 +44250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -298,6 +302,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -309,12 +314,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,10 +335,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -345,6 +350,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -421,12 +427,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -472,7 +481,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20404,7 +44318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -510,9 +519,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20418,7 +44332,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/libkopete/Makefile.in
 +++ kopete/libkopete/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -216,6 +216,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -312,6 +313,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20428,7 +44350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -355,6 +359,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -366,12 +371,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -390,10 +392,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -402,6 +407,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -478,12 +484,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20437,7 +44418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20449,102 +44430,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1226,18 +1229,18 @@
- mocs: kopeteaccount.moc
- 
- #>+ 3
--kopetewalletmanager.moc: $(srcdir)/kopetewalletmanager.h
--	$(MOC) $(srcdir)/kopetewalletmanager.h -o kopetewalletmanager.moc
-+kopetecontact.moc: $(srcdir)/kopetecontact.h
-+	$(MOC) $(srcdir)/kopetecontact.h -o kopetecontact.moc
- 
- #>+ 2
--mocs: kopetewalletmanager.moc
-+mocs: kopetecontact.moc
- 
- #>+ 3
--kopetecontact.moc: $(srcdir)/kopetecontact.h
--	$(MOC) $(srcdir)/kopetecontact.h -o kopetecontact.moc
-+kopetewalletmanager.moc: $(srcdir)/kopetewalletmanager.h
-+	$(MOC) $(srcdir)/kopetewalletmanager.h -o kopetewalletmanager.moc
- 
- #>+ 2
--mocs: kopetecontact.moc
-+mocs: kopetewalletmanager.moc
- 
- #>+ 3
- kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
-@@ -1254,18 +1257,18 @@
- mocs: kopetecommandhandler.moc
- 
- #>+ 3
--kopetepluginmanager.moc: $(srcdir)/kopetepluginmanager.h
--	$(MOC) $(srcdir)/kopetepluginmanager.h -o kopetepluginmanager.moc
-+kopeteawayaction.moc: $(srcdir)/kopeteawayaction.h
-+	$(MOC) $(srcdir)/kopeteawayaction.h -o kopeteawayaction.moc
- 
- #>+ 2
--mocs: kopetepluginmanager.moc
-+mocs: kopeteawayaction.moc
- 
- #>+ 3
--kopeteawayaction.moc: $(srcdir)/kopeteawayaction.h
--	$(MOC) $(srcdir)/kopeteawayaction.h -o kopeteawayaction.moc
-+kopetepluginmanager.moc: $(srcdir)/kopetepluginmanager.h
-+	$(MOC) $(srcdir)/kopetepluginmanager.h -o kopetepluginmanager.moc
- 
- #>+ 2
--mocs: kopeteawayaction.moc
-+mocs: kopetepluginmanager.moc
- 
- #>+ 3
- kautoconfig.moc: $(srcdir)/kautoconfig.h
-@@ -1373,18 +1376,18 @@
- mocs: kopeteplugin.moc
- 
- #>+ 3
--kopetesimplemessagehandler.moc: $(srcdir)/kopetesimplemessagehandler.h
--	$(MOC) $(srcdir)/kopetesimplemessagehandler.h -o kopetesimplemessagehandler.moc
-+kcautoconfigmodule.moc: $(srcdir)/kcautoconfigmodule.h
-+	$(MOC) $(srcdir)/kcautoconfigmodule.h -o kcautoconfigmodule.moc
- 
- #>+ 2
--mocs: kopetesimplemessagehandler.moc
-+mocs: kcautoconfigmodule.moc
- 
- #>+ 3
--kcautoconfigmodule.moc: $(srcdir)/kcautoconfigmodule.h
--	$(MOC) $(srcdir)/kcautoconfigmodule.h -o kcautoconfigmodule.moc
-+kopetesimplemessagehandler.moc: $(srcdir)/kopetesimplemessagehandler.h
-+	$(MOC) $(srcdir)/kopetesimplemessagehandler.h -o kopetesimplemessagehandler.moc
- 
- #>+ 2
--mocs: kcautoconfigmodule.moc
-+mocs: kopetesimplemessagehandler.moc
- 
- #>+ 3
- kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
-@@ -1451,7 +1454,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 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 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)/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
-@@ -232,6 +232,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -232,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20554,7 +44450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -275,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -286,12 +291,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -310,10 +312,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -322,6 +327,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20563,7 +44518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20575,18 +44530,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -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 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
-@@ -304,6 +304,9 @@
+@@ -208,6 +208,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -304,6 +305,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20596,7 +44550,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -358,12 +363,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -394,6 +399,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -470,12 +476,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -530,7 +539,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20605,7 +44618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20619,7 +44632,15 @@
  clean-checkLTLIBRARIES:
 --- kopete/libkopete/tests/mock/Makefile.in
 +++ kopete/libkopete/tests/mock/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -239,6 +240,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20629,7 +44650,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -282,6 +286,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -293,12 +298,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -317,10 +319,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -329,6 +334,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -405,12 +411,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20638,7 +44718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20652,7 +44732,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/libkopete/ui/Makefile.in
 +++ kopete/libkopete/ui/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -257,6 +258,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20662,7 +44750,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -300,6 +304,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -311,12 +316,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,10 +337,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -347,6 +352,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -423,12 +429,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -487,7 +496,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20671,7 +44818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -525,9 +534,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20683,43 +44830,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -859,18 +862,18 @@
- mocs: kopetelistviewitem.moc
- 
- #>+ 3
--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: kopetelistviewsearchline.moc
-+mocs: metacontactselectorwidget.moc
- 
- #>+ 3
--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: metacontactselectorwidget.moc
-+mocs: kopetelistviewsearchline.moc
- 
- #>+ 3
- addressbookselectorwidget.moc: $(srcdir)/addressbookselectorwidget.h
-@@ -895,7 +898,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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=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
-@@ -214,6 +214,9 @@
+@@ -118,6 +118,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -214,6 +215,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20729,7 +44850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -257,6 +261,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -268,12 +273,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -292,10 +294,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -304,6 +309,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -380,12 +386,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -412,7 +421,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -20738,7 +44918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -450,9 +453,9 @@
+@@ -450,9 +459,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20752,7 +44932,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/addbookmarks/Makefile.in
 +++ kopete/plugins/addbookmarks/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -166,6 +166,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -262,6 +263,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20762,7 +44950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -305,6 +309,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -316,12 +321,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -340,10 +342,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -352,6 +357,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -484,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20771,7 +45018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20785,7 +45032,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/alias/Makefile.in
 +++ kopete/plugins/alias/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -252,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20795,7 +45050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -295,6 +299,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -306,12 +311,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -330,10 +332,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -342,6 +347,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -418,12 +424,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -468,7 +477,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20804,7 +45118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -506,9 +515,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20816,57 +45130,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -820,18 +823,18 @@
- 
- 
- #>+ 3
--aliasplugin.moc: $(srcdir)/aliasplugin.h
--	$(MOC) $(srcdir)/aliasplugin.h -o aliasplugin.moc
-+aliaspreferences.moc: $(srcdir)/aliaspreferences.h
-+	$(MOC) $(srcdir)/aliaspreferences.h -o aliaspreferences.moc
- 
- #>+ 2
--mocs: aliasplugin.moc
-+mocs: aliaspreferences.moc
- 
- #>+ 3
--aliaspreferences.moc: $(srcdir)/aliaspreferences.h
--	$(MOC) $(srcdir)/aliaspreferences.h -o aliaspreferences.moc
-+aliasplugin.moc: $(srcdir)/aliasplugin.h
-+	$(MOC) $(srcdir)/aliasplugin.h -o aliasplugin.moc
- 
- #>+ 2
--mocs: aliaspreferences.moc
-+mocs: aliasplugin.moc
- 
- #>+ 3
- editaliasdialog.moc: $(srcdir)/editaliasdialog.h
-@@ -851,10 +854,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  aliasplugin.moc aliaspreferences.moc editaliasdialog.moc
-+	-rm -f  aliaspreferences.moc aliasplugin.moc editaliasdialog.moc
- 
- #>+ 2
--KDE_DIST=aliaspreferences.h aliasplugin.h editaliasdialog.h kopete_alias.desktop kopete_alias_config.desktop Makefile.in aliasdialog.ui aliasdialogbase.ui Makefile.am 
-+KDE_DIST=aliaspreferences.h aliasplugin.h editaliasdialog.h kopete_alias.desktop kopete_alias_config.desktop aliasdialog.ui Makefile.in aliasdialogbase.ui Makefile.am 
- 
- #>+ 5
- clean-ui:
-@@ -945,8 +948,8 @@
- 
- #>+ 11
- nmcheck: 
--aliaspreferences.o: aliaspreferences.moc 
- aliasplugin.o: aliasplugin.moc 
-+aliaspreferences.o: aliaspreferences.moc 
- $(srcdir)/editaliasdialog.cpp: aliasdialogbase.h aliasdialog.h 
- nmcheck-am: nmcheck
- aliasplugin.lo: aliasplugin.moc 
 --- kopete/plugins/autoreplace/icons/Makefile.in
 +++ kopete/plugins/autoreplace/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20876,7 +45150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20885,7 +45218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20899,7 +45232,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/autoreplace/Makefile.in
 +++ kopete/plugins/autoreplace/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -177,6 +177,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -273,6 +274,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20909,7 +45250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -316,6 +320,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -327,12 +332,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,10 +353,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -363,6 +368,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -439,12 +445,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -490,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20918,7 +45318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20932,7 +45332,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/connectionstatus/Makefile.in
 +++ kopete/plugins/connectionstatus/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -240,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20942,7 +45350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -283,6 +287,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -294,12 +299,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -318,10 +320,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -330,6 +335,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -406,12 +412,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20951,7 +45418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20965,7 +45432,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/contactnotes/Makefile.in
 +++ kopete/plugins/contactnotes/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -244,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20975,7 +45450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -287,6 +291,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -298,12 +303,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,10 +324,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -334,6 +339,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -410,12 +416,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -453,7 +462,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20984,7 +45518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -491,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20998,7 +45532,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/cryptography/icons/Makefile.in
 +++ kopete/plugins/cryptography/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21008,7 +45550,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21017,7 +45618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21031,7 +45632,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/cryptography/Makefile.in
 +++ kopete/plugins/cryptography/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -276,6 +277,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21041,7 +45650,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -319,6 +323,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -330,12 +335,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,10 +356,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -366,6 +371,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -442,12 +448,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -497,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21050,7 +45718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21062,70 +45730,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -977,6 +980,13 @@
- 
- 
- #>+ 3
-+cryptographyguiclient.moc: $(srcdir)/cryptographyguiclient.h
-+	$(MOC) $(srcdir)/cryptographyguiclient.h -o cryptographyguiclient.moc
-+
-+#>+ 2
-+mocs: cryptographyguiclient.moc
-+
-+#>+ 3
- kgpginterface.moc: $(srcdir)/kgpginterface.h
- 	$(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
- 
-@@ -984,11 +994,11 @@
- mocs: kgpginterface.moc
- 
- #>+ 3
--cryptographyguiclient.moc: $(srcdir)/cryptographyguiclient.h
--	$(MOC) $(srcdir)/cryptographyguiclient.h -o cryptographyguiclient.moc
-+cryptographyselectuserkey.moc: $(srcdir)/cryptographyselectuserkey.h
-+	$(MOC) $(srcdir)/cryptographyselectuserkey.h -o cryptographyselectuserkey.moc
- 
- #>+ 2
--mocs: cryptographyguiclient.moc
-+mocs: cryptographyselectuserkey.moc
- 
- #>+ 3
- kgpgselkey.moc: $(srcdir)/kgpgselkey.h
-@@ -1005,13 +1015,6 @@
- mocs: popuppublic.moc
- 
- #>+ 3
--cryptographyselectuserkey.moc: $(srcdir)/cryptographyselectuserkey.h
--	$(MOC) $(srcdir)/cryptographyselectuserkey.h -o cryptographyselectuserkey.moc
--
--#>+ 2
--mocs: cryptographyselectuserkey.moc
--
--#>+ 3
- cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
- 	$(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
- 
-@@ -1036,7 +1039,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kgpginterface.moc cryptographyguiclient.moc kgpgselkey.moc popuppublic.moc cryptographyselectuserkey.moc cryptographypreferences.moc cryptographyplugin.moc
-+	-rm -f  cryptographyguiclient.moc kgpginterface.moc cryptographyselectuserkey.moc kgpgselkey.moc popuppublic.moc cryptographypreferences.moc cryptographyplugin.moc
- 
- #>+ 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 
-@@ -1105,7 +1108,7 @@
- 	rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
- 
- #>+ 11
--kopete_cryptography_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cryptographyplugin.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/cryptographyguiclient.cpp $(srcdir)/cryptographyselectuserkey.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgselkey.cpp cryptographyuserkey_ui.cpp  cryptographyguiclient.moc kgpginterface.moc cryptographyuserkey_ui.moc cryptographyselectuserkey.moc popuppublic.moc kgpgselkey.moc cryptographyplugin.moc
-+kopete_cryptography_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cryptographyplugin.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/cryptographyguiclient.cpp $(srcdir)/cryptographyselectuserkey.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgselkey.cpp cryptographyuserkey_ui.cpp  kgpginterface.moc cryptographyguiclient.moc cryptographyuserkey_ui.moc popuppublic.moc kgpgselkey.moc cryptographyselectuserkey.moc cryptographyplugin.moc
- 	@echo 'creating kopete_cryptography_la.all_cpp.cpp ...'; \
- 	rm -f kopete_cryptography_la.all_cpp.files kopete_cryptography_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
 --- kopete/plugins/highlight/icons/Makefile.in
 +++ kopete/plugins/highlight/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21135,7 +45750,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21144,7 +45818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21158,7 +45832,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/highlight/Makefile.in
 +++ kopete/plugins/highlight/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -177,6 +177,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -273,6 +274,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21168,7 +45850,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -316,6 +320,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -327,12 +332,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,10 +353,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -363,6 +368,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -439,12 +445,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -490,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21177,7 +45918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21189,18 +45930,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -975,7 +978,7 @@
- 	-rm -f  highlightpreferences.moc highlightplugin.moc
- 
- #>+ 2
--KDE_DIST=kopete_highlight.desktop highlightconfig.h filter.h highlightprefsbase.ui highlightplugin.h highlightpreferences.h Makefile.in Makefile.am kopete_highlight_config.desktop 
-+KDE_DIST=kopete_highlight.desktop highlightconfig.h filter.h highlightplugin.h highlightprefsbase.ui highlightpreferences.h Makefile.in Makefile.am kopete_highlight_config.desktop 
- 
- #>+ 4
- clean-ui:
 --- kopete/plugins/history/Makefile.in
 +++ kopete/plugins/history/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -163,6 +163,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -259,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21210,7 +45950,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -302,6 +306,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -313,12 +318,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,10 +339,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -349,6 +354,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -425,12 +431,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -483,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21219,7 +46018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21231,52 +46030,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -877,18 +880,18 @@
- 
- 
- #>+ 3
--historyplugin.moc: $(srcdir)/historyplugin.h
--	$(MOC) $(srcdir)/historyplugin.h -o historyplugin.moc
-+historyguiclient.moc: $(srcdir)/historyguiclient.h
-+	$(MOC) $(srcdir)/historyguiclient.h -o historyguiclient.moc
- 
- #>+ 2
--mocs: historyplugin.moc
-+mocs: historyguiclient.moc
- 
- #>+ 3
--historyguiclient.moc: $(srcdir)/historyguiclient.h
--	$(MOC) $(srcdir)/historyguiclient.h -o historyguiclient.moc
-+historyplugin.moc: $(srcdir)/historyplugin.h
-+	$(MOC) $(srcdir)/historyplugin.h -o historyplugin.moc
- 
- #>+ 2
--mocs: historyguiclient.moc
-+mocs: historyplugin.moc
- 
- #>+ 3
- historylogger.moc: $(srcdir)/historylogger.h
-@@ -922,7 +925,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  historyplugin.moc historyguiclient.moc historylogger.moc historypreferences.moc historydialog.moc
-+	-rm -f  historyguiclient.moc historyplugin.moc historylogger.moc historypreferences.moc historydialog.moc
- 
- #>+ 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 
-@@ -997,7 +1000,7 @@
- 	rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
- 
- #>+ 11
--kopete_history_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/historyplugin.cpp $(srcdir)/historydialog.cpp $(srcdir)/historylogger.cpp $(srcdir)/converter.cpp $(srcdir)/historyguiclient.cpp historyviewer.cpp historyconfig.cpp  historyguiclient.moc historyplugin.moc historylogger.moc historyviewer.moc historydialog.moc
-+kopete_history_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/historyplugin.cpp $(srcdir)/historydialog.cpp $(srcdir)/historylogger.cpp $(srcdir)/converter.cpp $(srcdir)/historyguiclient.cpp historyviewer.cpp historyconfig.cpp  historyplugin.moc historyguiclient.moc historylogger.moc historyviewer.moc historydialog.moc
- 	@echo 'creating kopete_history_la.all_cpp.cpp ...'; \
- 	rm -f kopete_history_la.all_cpp.files kopete_history_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
 --- kopete/plugins/latex/icons/Makefile.in
 +++ kopete/plugins/latex/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21286,7 +46050,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21295,7 +46118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21309,7 +46132,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/latex/Makefile.in
 +++ kopete/plugins/latex/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -177,6 +177,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -273,6 +274,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21319,7 +46150,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -316,6 +320,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -327,12 +332,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,10 +353,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -363,6 +368,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -439,12 +445,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -496,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21328,7 +46218,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21342,7 +46232,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/Makefile.in
 +++ kopete/plugins/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -215,6 +216,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21352,7 +46250,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
+@@ -258,6 +262,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -269,12 +274,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -293,10 +295,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -305,6 +310,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -418,7 +427,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21361,7 +46318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -456,9 +459,9 @@
+@@ -456,9 +465,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21375,7 +46332,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/motionautoaway/Makefile.in
 +++ kopete/plugins/motionautoaway/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -256,6 +257,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21385,7 +46350,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -299,6 +303,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -310,12 +315,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -422,12 +428,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -473,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21394,7 +46418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21406,43 +46430,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -843,18 +846,18 @@
- 
- 
- #>+ 3
--motionawayplugin.moc: $(srcdir)/motionawayplugin.h
--	$(MOC) $(srcdir)/motionawayplugin.h -o motionawayplugin.moc
-+motionawaypreferences.moc: $(srcdir)/motionawaypreferences.h
-+	$(MOC) $(srcdir)/motionawaypreferences.h -o motionawaypreferences.moc
- 
- #>+ 2
--mocs: motionawayplugin.moc
-+mocs: motionawaypreferences.moc
- 
- #>+ 3
--motionawaypreferences.moc: $(srcdir)/motionawaypreferences.h
--	$(MOC) $(srcdir)/motionawaypreferences.h -o motionawaypreferences.moc
-+motionawayplugin.moc: $(srcdir)/motionawayplugin.h
-+	$(MOC) $(srcdir)/motionawayplugin.h -o motionawayplugin.moc
- 
- #>+ 2
--mocs: motionawaypreferences.moc
-+mocs: motionawayplugin.moc
- 
- #>+ 8
- kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
-@@ -867,7 +870,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  motionawayplugin.moc motionawaypreferences.moc
-+	-rm -f  motionawaypreferences.moc motionawayplugin.moc
- 
- #>+ 2
- 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
-@@ -260,6 +260,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -260,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21452,7 +46450,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -303,6 +307,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -314,12 +319,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,10 +340,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -350,6 +355,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -426,12 +432,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -478,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21461,7 +46518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -516,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21473,15 +46530,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -891,7 +894,7 @@
- 	-rm -f  netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
- 
- #>+ 2
--KDE_DIST=netmeetingchatui.rc kopete_netmeeting.desktop netmeetinginvitation.h netmeetingpreferences.h kopete_netmeeting_config.desktop Makefile.in netmeetingguiclient.h netmeetingplugin.h Makefile.am netmeetingprefs_ui.ui 
-+KDE_DIST=netmeetingchatui.rc kopete_netmeeting.desktop netmeetinginvitation.h netmeetingpreferences.h kopete_netmeeting_config.desktop Makefile.in netmeetingguiclient.h netmeetingplugin.h netmeetingprefs_ui.ui Makefile.am 
- 
- #>+ 4
- clean-ui:
 --- kopete/plugins/nowlistening/Makefile.in
 +++ kopete/plugins/nowlistening/Makefile.in
 @@ -73,8 +73,7 @@
@@ -21494,7 +46542,15 @@
  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 @@
+@@ -170,6 +169,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21504,7 +46560,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,8 +465,8 @@
+@@ -309,6 +312,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -320,12 +324,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +345,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -356,6 +360,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -432,12 +437,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -463,8 +471,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
@@ -21515,7 +46630,7 @@
  #>- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
  #>+ 1
  kcm_kopete_nowlistening_la_SOURCES= nowlisteningpreferences.cpp  nowlisteningprefs.cpp nowlisteningconfig.cpp
-@@ -486,7 +488,7 @@
+@@ -486,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21524,7 +46639,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -524,9 +526,9 @@
+@@ -524,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21536,52 +46651,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -890,18 +892,18 @@
- mocs: nowlisteningpreferences.moc
- 
- #>+ 3
--nowlisteningguiclient.moc: $(srcdir)/nowlisteningguiclient.h
--	$(MOC) $(srcdir)/nowlisteningguiclient.h -o nowlisteningguiclient.moc
-+nowlisteningplugin.moc: $(srcdir)/nowlisteningplugin.h
-+	$(MOC) $(srcdir)/nowlisteningplugin.h -o nowlisteningplugin.moc
- 
- #>+ 2
--mocs: nowlisteningguiclient.moc
-+mocs: nowlisteningplugin.moc
- 
- #>+ 3
--nowlisteningplugin.moc: $(srcdir)/nowlisteningplugin.h
--	$(MOC) $(srcdir)/nowlisteningplugin.h -o nowlisteningplugin.moc
-+nowlisteningguiclient.moc: $(srcdir)/nowlisteningguiclient.h
-+	$(MOC) $(srcdir)/nowlisteningguiclient.h -o nowlisteningguiclient.moc
- 
- #>+ 2
--mocs: nowlisteningplugin.moc
-+mocs: nowlisteningguiclient.moc
- 
- #>+ 8
- kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
-@@ -914,7 +916,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  nowlisteningpreferences.moc nowlisteningguiclient.moc nowlisteningplugin.moc
-+	-rm -f  nowlisteningpreferences.moc nowlisteningplugin.moc nowlisteningguiclient.moc
- 
- #>+ 2
- 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)/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
-@@ -247,6 +247,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -247,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21591,7 +46671,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -290,6 +294,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -301,12 +306,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,10 +327,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -337,6 +342,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -413,12 +419,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -460,7 +469,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21600,7 +46739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -498,9 +507,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21614,7 +46753,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/smpppdcs/icons/Makefile.in
 +++ kopete/plugins/smpppdcs/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21624,7 +46771,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21633,7 +46839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21647,7 +46853,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
 +++ kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -138,6 +138,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -234,6 +235,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21657,7 +46871,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -277,6 +281,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -288,12 +293,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -312,10 +314,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -324,6 +329,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -400,12 +406,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21666,7 +46939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21680,7 +46953,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/plugins/smpppdcs/Makefile.in
 +++ kopete/plugins/smpppdcs/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -261,6 +262,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21690,7 +46971,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -304,6 +308,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -315,12 +320,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -339,10 +341,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -351,6 +356,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21699,7 +47039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21713,7 +47053,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/statistics/Makefile.in
 +++ kopete/plugins/statistics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -261,6 +262,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21723,7 +47071,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -475,7 +478,7 @@
+@@ -304,6 +308,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -315,12 +320,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -339,10 +341,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -351,6 +356,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -427,12 +433,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -475,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21732,7 +47139,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -513,9 +516,9 @@
+@@ -513,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21746,7 +47153,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/statistics/sqlite/Makefile.in
 +++ kopete/plugins/statistics/sqlite/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -253,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21756,7 +47171,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -296,6 +300,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -307,12 +312,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -331,10 +333,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -343,6 +348,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -419,12 +425,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -501,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -21765,7 +47239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -539,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21779,7 +47253,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/plugins/texteffect/icons/Makefile.in
 +++ kopete/plugins/texteffect/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21789,7 +47271,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21798,7 +47339,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21812,7 +47353,15 @@
  mostlyclean-libtool:
 --- kopete/plugins/texteffect/Makefile.in
 +++ kopete/plugins/texteffect/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -177,6 +177,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -273,6 +274,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21822,7 +47371,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -316,6 +320,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -327,12 +332,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,10 +353,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -363,6 +368,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -439,12 +445,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -490,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21831,7 +47439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21845,7 +47453,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/plugins/translator/Makefile.in
 +++ kopete/plugins/translator/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -263,6 +264,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21855,7 +47471,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -306,6 +310,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -317,12 +322,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -341,10 +343,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -353,6 +358,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -429,12 +435,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -483,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21864,7 +47539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21876,18 +47551,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -890,7 +893,7 @@
- 	-rm -f  translatorplugin.moc translatorguiclient.moc translatordialog.moc
- 
- #>+ 2
--KDE_DIST=translatorchatui.rc translatordialog.h kopete_translator_config.desktop translatorlanguages.h translatorprefsbase.ui kopete_translator.desktop Makefile.in translatorplugin.h translatorui.rc translatorguiclient.h Makefile.am 
-+KDE_DIST=translatorchatui.rc translatordialog.h kopete_translator_config.desktop translatorlanguages.h translatorprefsbase.ui kopete_translator.desktop Makefile.in translatorui.rc translatorplugin.h translatorguiclient.h Makefile.am 
- 
- #>+ 4
- clean-ui:
 --- kopete/plugins/webpresence/Makefile.in
 +++ kopete/plugins/webpresence/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -254,6 +255,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21897,7 +47571,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -297,6 +301,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -308,12 +313,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,10 +334,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -344,6 +349,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -420,12 +426,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -477,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21906,7 +47639,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21920,7 +47653,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/gadu/icons/Makefile.in
 +++ kopete/protocols/gadu/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21930,7 +47671,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21939,7 +47739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21951,80 +47751,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -577,7 +580,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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:
-@@ -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_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_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_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_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
-+	$(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_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_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/16x16/actions/gg_offline.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.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/32x32/apps/gadu_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/gadu/libgadu/Makefile.in
 +++ kopete/protocols/gadu/libgadu/Makefile.in
-@@ -223,6 +223,9 @@
+@@ -127,6 +127,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -223,6 +224,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22034,7 +47771,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -266,6 +270,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -277,12 +282,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -301,10 +303,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -313,6 +318,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -389,12 +395,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -433,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -22043,7 +47839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22057,7 +47853,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/gadu/Makefile.in
 +++ kopete/protocols/gadu/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -175,6 +175,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -271,6 +272,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22067,7 +47871,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -314,6 +318,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -325,12 +330,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -349,10 +351,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -361,6 +366,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -437,12 +443,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -503,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22076,7 +47939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22088,96 +47951,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -997,11 +1000,11 @@
- mocs: gaducommands.moc
- 
- #>+ 3
--gadupubdir.moc: $(srcdir)/gadupubdir.h
--	$(MOC) $(srcdir)/gadupubdir.h -o gadupubdir.moc
-+gadueditcontact.moc: $(srcdir)/gadueditcontact.h
-+	$(MOC) $(srcdir)/gadueditcontact.h -o gadueditcontact.moc
- 
- #>+ 2
--mocs: gadupubdir.moc
-+mocs: gadueditcontact.moc
- 
- #>+ 3
- gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
-@@ -1011,11 +1014,11 @@
- mocs: gaduregisteraccount.moc
- 
- #>+ 3
--gadueditcontact.moc: $(srcdir)/gadueditcontact.h
--	$(MOC) $(srcdir)/gadueditcontact.h -o gadueditcontact.moc
-+gadupubdir.moc: $(srcdir)/gadupubdir.h
-+	$(MOC) $(srcdir)/gadupubdir.h -o gadupubdir.moc
- 
- #>+ 2
--mocs: gadueditcontact.moc
-+mocs: gadupubdir.moc
- 
- #>+ 3
- gaduaway.moc: $(srcdir)/gaduaway.h
-@@ -1032,25 +1035,25 @@
- mocs: gaduprotocol.moc
- 
- #>+ 3
--gaducontact.moc: $(srcdir)/gaducontact.h
--	$(MOC) $(srcdir)/gaducontact.h -o gaducontact.moc
-+gadueditaccount.moc: $(srcdir)/gadueditaccount.h
-+	$(MOC) $(srcdir)/gadueditaccount.h -o gadueditaccount.moc
- 
- #>+ 2
--mocs: gaducontact.moc
-+mocs: gadueditaccount.moc
- 
- #>+ 3
--gadueditaccount.moc: $(srcdir)/gadueditaccount.h
--	$(MOC) $(srcdir)/gadueditaccount.h -o gadueditaccount.moc
-+gaducontact.moc: $(srcdir)/gaducontact.h
-+	$(MOC) $(srcdir)/gaducontact.h -o gaducontact.moc
- 
- #>+ 2
--mocs: gadueditaccount.moc
-+mocs: gaducontact.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadupubdir.moc gaduregisteraccount.moc gadueditcontact.moc gaduaway.moc gaduprotocol.moc gaducontact.moc gadueditaccount.moc
-+	-rm -f  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadueditcontact.moc gaduregisteraccount.moc gadupubdir.moc gaduaway.moc gaduprotocol.moc gadueditaccount.moc gaducontact.moc
- 
- #>+ 2
--KDE_DIST=README.gadu gaduaddcontactpage.h gadurichtextformat.h gadueditcontact.h gadupubdir.h gaduaccount.h gadudccserver.h kopete_gadu.desktop gaducontactlist.h gaducontact.h gadueditaccount.h gaduprotocol.h gaducommands.h gadudcc.h Makefile.in gaduregisteraccount.h gadudcctransaction.h gaduaway.h gadusession.h Makefile.am 
-+KDE_DIST=README.gadu gaduaddcontactpage.h gadueditcontact.h gadurichtextformat.h gadupubdir.h gaduaccount.h gadudccserver.h kopete_gadu.desktop gaducontactlist.h gaducontact.h gadueditaccount.h gaduprotocol.h gaducommands.h gadudcc.h Makefile.in gaduregisteraccount.h gadudcctransaction.h gaduaway.h gadusession.h Makefile.am 
- 
- #>+ 3
- clean-closures:
-@@ -1098,7 +1101,7 @@
- 
- 
- #>+ 11
--kopete_gadu_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gaduaway.cpp $(srcdir)/gadueditcontact.cpp $(srcdir)/gaducommands.cpp $(srcdir)/gadueditaccount.cpp $(srcdir)/gadusession.cpp $(srcdir)/gaducontact.cpp $(srcdir)/gaduaddcontactpage.cpp $(srcdir)/gaduprotocol.cpp $(srcdir)/gaduaccount.cpp $(srcdir)/gadupubdir.cpp $(srcdir)/gaduregisteraccount.cpp $(srcdir)/gaducontactlist.cpp $(srcdir)/gadurichtextformat.cpp $(srcdir)/gadudccserver.cpp $(srcdir)/gadudcctransaction.cpp $(srcdir)/gadudcc.cpp  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadueditcontact.moc gaduregisteraccount.moc gadupubdir.moc gaduaway.moc gaduprotocol.moc gadueditaccount.moc gaducontact.moc
-+kopete_gadu_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gaduaway.cpp $(srcdir)/gadueditcontact.cpp $(srcdir)/gaducommands.cpp $(srcdir)/gadueditaccount.cpp $(srcdir)/gadusession.cpp $(srcdir)/gaducontact.cpp $(srcdir)/gaduaddcontactpage.cpp $(srcdir)/gaduprotocol.cpp $(srcdir)/gaduaccount.cpp $(srcdir)/gadupubdir.cpp $(srcdir)/gaduregisteraccount.cpp $(srcdir)/gaducontactlist.cpp $(srcdir)/gadurichtextformat.cpp $(srcdir)/gadudccserver.cpp $(srcdir)/gadudcctransaction.cpp $(srcdir)/gadudcc.cpp  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadupubdir.moc gaduregisteraccount.moc gadueditcontact.moc gaduaway.moc gaduprotocol.moc gaducontact.moc gadueditaccount.moc
- 	@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; \
-@@ -1149,11 +1152,11 @@
- gadupubdir.o: gadupubdir.moc 
- gadueditaccount.lo: gadueditaccount.moc 
- gadudccserver.lo: gadudccserver.moc 
--gadueditcontact.lo: gadueditcontact.moc 
- gadueditcontact.o: gadueditcontact.moc 
-+gadueditcontact.lo: gadueditcontact.moc 
- gaducontact.o: gaducontact.moc 
--gaduaccount.o: gaduaccount.moc 
- gadupubdir.lo: gadupubdir.moc 
-+gaduaccount.o: gaduaccount.moc 
- gaduaway.lo: gaduaway.moc 
- gaducommands.lo: gaducommands.moc 
- gaduaddcontactpage.o: gaduaddcontactpage.moc 
 --- kopete/protocols/gadu/ui/Makefile.in
 +++ kopete/protocols/gadu/ui/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -229,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22187,7 +47971,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -272,6 +276,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -283,12 +288,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,10 +309,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -319,6 +324,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -395,12 +401,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -441,7 +450,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22196,7 +48039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -479,9 +488,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22210,7 +48053,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/groupwise/icons/Makefile.in
 +++ kopete/protocols/groupwise/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22220,7 +48071,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22229,7 +48139,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22241,92 +48151,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -577,7 +580,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cr22-app-groupwise_protocol.png cr16-action-groupwise_connecting.mng cr16-app-groupwise_protocol.png cr16-action-groupwise_online.png cr16-action-logging.png cr48-app-groupwise_protocol.png cr22-action-logging.png cr48-action-logging.png cr16-action-groupwise_away.png cr32-action-logging.png cr16-action-groupwise_invisible.png Makefile.in cr16-action-groupwise_busy.png cr64-app-groupwise_protocol.png cr32-app-groupwise_protocol.png Makefile.am cr64-action-logging.png 
-+KDE_DIST=cr22-app-groupwise_protocol.png cr16-action-groupwise_connecting.mng cr16-app-groupwise_protocol.png cr16-action-groupwise_online.png cr16-action-logging.png cr48-app-groupwise_protocol.png cr22-action-logging.png cr48-action-logging.png cr16-action-groupwise_away.png cr32-action-logging.png cr16-action-groupwise_invisible.png Makefile.in cr64-app-groupwise_protocol.png cr16-action-groupwise_busy.png cr32-app-groupwise_protocol.png Makefile.am cr64-action-logging.png 
- 
- #>+ 2
- docs-am:
-@@ -585,47 +588,47 @@
- #>+ 44
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions
- 	$(INSTALL_DATA) $(srcdir)/cr64-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
--	$(INSTALL_DATA) $(srcdir)/cr48-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/cr22-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/groupwise/libgroupwise/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -174,6 +174,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -270,6 +271,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22336,7 +48171,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -313,6 +317,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -324,12 +329,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -348,10 +350,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -360,6 +365,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -436,12 +442,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -508,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -22345,7 +48239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22357,68 +48251,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -945,18 +948,18 @@
- 
- 
- #>+ 3
--responseprotocol.moc: $(srcdir)/responseprotocol.h
--	$(MOC) $(srcdir)/responseprotocol.h -o responseprotocol.moc
-+userdetailsmanager.moc: $(srcdir)/userdetailsmanager.h
-+	$(MOC) $(srcdir)/userdetailsmanager.h -o userdetailsmanager.moc
- 
- #>+ 2
--mocs: responseprotocol.moc
-+mocs: userdetailsmanager.moc
- 
- #>+ 3
--userdetailsmanager.moc: $(srcdir)/userdetailsmanager.h
--	$(MOC) $(srcdir)/userdetailsmanager.h -o userdetailsmanager.moc
-+responseprotocol.moc: $(srcdir)/responseprotocol.h
-+	$(MOC) $(srcdir)/responseprotocol.h -o responseprotocol.moc
- 
- #>+ 2
--mocs: userdetailsmanager.moc
-+mocs: responseprotocol.moc
- 
- #>+ 3
- stream.moc: $(srcdir)/stream.h
-@@ -966,18 +969,18 @@
- mocs: stream.moc
- 
- #>+ 3
--task.moc: $(srcdir)/task.h
--	$(MOC) $(srcdir)/task.h -o task.moc
-+tlshandler.moc: $(srcdir)/tlshandler.h
-+	$(MOC) $(srcdir)/tlshandler.h -o tlshandler.moc
- 
- #>+ 2
--mocs: task.moc
-+mocs: tlshandler.moc
- 
- #>+ 3
--tlshandler.moc: $(srcdir)/tlshandler.h
--	$(MOC) $(srcdir)/tlshandler.h -o tlshandler.moc
-+task.moc: $(srcdir)/task.h
-+	$(MOC) $(srcdir)/task.h -o task.moc
- 
- #>+ 2
--mocs: tlshandler.moc
-+mocs: task.moc
- 
- #>+ 3
- qcatlshandler.moc: $(srcdir)/qcatlshandler.h
-@@ -1067,7 +1070,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  responseprotocol.moc userdetailsmanager.moc stream.moc task.moc tlshandler.moc qcatlshandler.moc client.moc coreprotocol.moc eventprotocol.moc bytestream.moc gwclientstream.moc securestream.moc privacymanager.moc safedelete.moc connector.moc inputprotocolbase.moc
-+	-rm -f  userdetailsmanager.moc responseprotocol.moc stream.moc tlshandler.moc task.moc qcatlshandler.moc client.moc coreprotocol.moc eventprotocol.moc bytestream.moc gwclientstream.moc securestream.moc privacymanager.moc safedelete.moc connector.moc inputprotocolbase.moc
- 
- #>+ 2
- KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am 
 --- kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -213,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22428,7 +48271,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -256,6 +260,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -267,12 +272,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -291,10 +293,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -303,6 +308,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -379,12 +385,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22437,7 +48339,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22451,7 +48353,15 @@
  mostlyclean-libtool:
 --- kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -226,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22461,7 +48371,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -269,6 +273,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -280,12 +285,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,10 +306,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -316,6 +321,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -392,12 +398,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -430,7 +439,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22470,7 +48439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -468,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22484,7 +48453,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -253,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22494,7 +48471,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -296,6 +300,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -307,12 +312,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -331,10 +333,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -343,6 +348,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -419,12 +425,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -477,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22503,7 +48539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22515,104 +48551,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -850,13 +853,6 @@
- mocs: connectiontask.moc
- 
- #>+ 3
--updateitemtask.moc: $(srcdir)/updateitemtask.h
--	$(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
--
--#>+ 2
--mocs: updateitemtask.moc
--
--#>+ 3
- logintask.moc: $(srcdir)/logintask.h
- 	$(MOC) $(srcdir)/logintask.h -o logintask.moc
- 
-@@ -871,6 +867,13 @@
- mocs: createcontactinstancetask.moc
- 
- #>+ 3
-+updateitemtask.moc: $(srcdir)/updateitemtask.h
-+	$(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
-+
-+#>+ 2
-+mocs: updateitemtask.moc
-+
-+#>+ 3
- rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
- 	$(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
- 
-@@ -892,18 +895,18 @@
- mocs: getdetailstask.moc
- 
- #>+ 3
--searchtask.moc: $(srcdir)/searchtask.h
--	$(MOC) $(srcdir)/searchtask.h -o searchtask.moc
-+privacyitemtask.moc: $(srcdir)/privacyitemtask.h
-+	$(MOC) $(srcdir)/privacyitemtask.h -o privacyitemtask.moc
- 
- #>+ 2
--mocs: searchtask.moc
-+mocs: privacyitemtask.moc
- 
- #>+ 3
--privacyitemtask.moc: $(srcdir)/privacyitemtask.h
--	$(MOC) $(srcdir)/privacyitemtask.h -o privacyitemtask.moc
-+searchtask.moc: $(srcdir)/searchtask.h
-+	$(MOC) $(srcdir)/searchtask.h -o searchtask.moc
- 
- #>+ 2
--mocs: privacyitemtask.moc
-+mocs: searchtask.moc
- 
- #>+ 3
- joinconferencetask.moc: $(srcdir)/joinconferencetask.h
-@@ -984,10 +987,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  deleteitemtask.moc createfoldertask.moc leaveconferencetask.moc setstatustask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc updateitemtask.moc logintask.moc createcontactinstancetask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc searchtask.moc privacyitemtask.moc joinconferencetask.moc createcontacttask.moc conferencetask.moc typingtask.moc needfoldertask.moc updatecontacttask.moc updatefoldertask.moc eventtask.moc movecontacttask.moc statustask.moc keepalivetask.moc
-+	-rm -f  deleteitemtask.moc createfoldertask.moc leaveconferencetask.moc setstatustask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc logintask.moc createcontactinstancetask.moc updateitemtask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc privacyitemtask.moc searchtask.moc joinconferencetask.moc createcontacttask.moc conferencetask.moc typingtask.moc needfoldertask.moc updatecontacttask.moc updatefoldertask.moc eventtask.moc movecontacttask.moc statustask.moc keepalivetask.moc
- 
- #>+ 2
--KDE_DIST=gwtasklogin.cpp keepalivetask.h createcontactinstancetask.h Makefile.in Makefile.am gwtasklogin.h 
-+KDE_DIST=gwtasklogin.cpp keepalivetask.h createcontactinstancetask.h Makefile.in gwtasklogin.h Makefile.am 
- 
- #>+ 3
- clean-closures:
-@@ -1035,7 +1038,7 @@
- 
- 
- #>+ 11
--libgroupwise_tasks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/requesttask.cpp $(srcdir)/eventtask.cpp $(srcdir)/logintask.cpp $(srcdir)/setstatustask.cpp $(srcdir)/statustask.cpp $(srcdir)/conferencetask.cpp $(srcdir)/createconferencetask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/getdetailstask.cpp $(srcdir)/getstatustask.cpp $(srcdir)/typingtask.cpp $(srcdir)/connectiontask.cpp $(srcdir)/sendinvitetask.cpp $(srcdir)/joinconferencetask.cpp $(srcdir)/leaveconferencetask.cpp $(srcdir)/rejectinvitetask.cpp $(srcdir)/keepalivetask.cpp $(srcdir)/createcontacttask.cpp $(srcdir)/modifycontactlisttask.cpp $(srcdir)/createfoldertask.cpp $(srcdir)/movecontacttask.cpp $(srcdir)/updateitemtask.cpp $(srcdir)/createcontactinstancetask.cpp $(srcdir)/deleteitemtask.cpp $(srcdir)/updatefoldertask.cpp $(srcdir)/updatecontacttask.cpp $(srcdir)/searchtask.cpp $(srcdir)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp  deleteitemtask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc createcontactinstancetask.moc logintask.moc updateitemtask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc privacyitemtask.moc searchtask.moc joinconferencetask.moc conferencetask.moc createcontacttask.moc typingtask.moc needfoldertask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc movecontacttask.moc keepalivetask.moc statustask.moc
-+libgroupwise_tasks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/requesttask.cpp $(srcdir)/eventtask.cpp $(srcdir)/logintask.cpp $(srcdir)/setstatustask.cpp $(srcdir)/statustask.cpp $(srcdir)/conferencetask.cpp $(srcdir)/createconferencetask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/getdetailstask.cpp $(srcdir)/getstatustask.cpp $(srcdir)/typingtask.cpp $(srcdir)/connectiontask.cpp $(srcdir)/sendinvitetask.cpp $(srcdir)/joinconferencetask.cpp $(srcdir)/leaveconferencetask.cpp $(srcdir)/rejectinvitetask.cpp $(srcdir)/keepalivetask.cpp $(srcdir)/createcontacttask.cpp $(srcdir)/modifycontactlisttask.cpp $(srcdir)/createfoldertask.cpp $(srcdir)/movecontacttask.cpp $(srcdir)/updateitemtask.cpp $(srcdir)/createcontactinstancetask.cpp $(srcdir)/deleteitemtask.cpp $(srcdir)/updatefoldertask.cpp $(srcdir)/updatecontacttask.cpp $(srcdir)/searchtask.cpp $(srcdir)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp  deleteitemtask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc updateitemtask.moc createcontactinstancetask.moc logintask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc searchtask.moc privacyitemtask.moc joinconferencetask.moc conferencetask.moc createcontacttask.moc typingtask.moc needfoldertask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc movecontacttask.moc keepalivetask.moc statustask.moc
- 	@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; \
-@@ -1108,8 +1111,8 @@
- conferencetask.lo: conferencetask.moc 
- createcontacttask.o: createcontacttask.moc 
- logintask.lo: logintask.moc 
--createcontactinstancetask.lo: createcontactinstancetask.moc 
- searchtask.lo: searchtask.moc 
-+createcontactinstancetask.lo: createcontactinstancetask.moc 
- updatecontacttask.lo: updatecontacttask.moc 
- setstatustask.lo: setstatustask.moc 
- logintask.o: logintask.moc 
-@@ -1122,8 +1125,8 @@
- typingtask.lo: typingtask.moc 
- requesttask.o: requesttask.moc 
- updateitemtask.lo: updateitemtask.moc 
--privacyitemtask.lo: privacyitemtask.moc 
- rejectinvitetask.lo: rejectinvitetask.moc 
-+privacyitemtask.lo: privacyitemtask.moc 
- joinconferencetask.lo: joinconferencetask.moc 
- statustask.o: statustask.moc 
- typingtask.o: typingtask.moc 
 --- kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -131,6 +131,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -227,6 +228,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22622,7 +48571,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -270,6 +274,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -281,12 +286,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,10 +307,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -317,6 +322,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -393,12 +399,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22631,7 +48639,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -466,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22645,7 +48653,15 @@
  clean-noinstPROGRAMS:
 --- kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
 +++ kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -247,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22655,7 +48671,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -290,6 +294,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -301,12 +306,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,10 +327,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -337,6 +342,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -413,12 +419,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -468,7 +477,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22664,7 +48739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -506,9 +515,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22678,7 +48753,15 @@
  clean-noinstPROGRAMS:
 --- kopete/protocols/groupwise/Makefile.in
 +++ kopete/protocols/groupwise/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -266,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22688,7 +48771,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -309,6 +313,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -320,12 +325,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -432,12 +438,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -490,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22697,7 +48839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22709,87 +48851,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -946,18 +949,18 @@
- 
- 
- #>+ 3
--gwprotocol.moc: $(srcdir)/gwprotocol.h
--	$(MOC) $(srcdir)/gwprotocol.h -o gwprotocol.moc
-+gwaccount.moc: $(srcdir)/gwaccount.h
-+	$(MOC) $(srcdir)/gwaccount.h -o gwaccount.moc
- 
- #>+ 2
--mocs: gwprotocol.moc
-+mocs: gwaccount.moc
- 
- #>+ 3
--gwaccount.moc: $(srcdir)/gwaccount.h
--	$(MOC) $(srcdir)/gwaccount.h -o gwaccount.moc
-+gwprotocol.moc: $(srcdir)/gwprotocol.h
-+	$(MOC) $(srcdir)/gwprotocol.h -o gwprotocol.moc
- 
- #>+ 2
--mocs: gwaccount.moc
-+mocs: gwprotocol.moc
- 
- #>+ 3
- gwbytestream.moc: $(srcdir)/gwbytestream.h
-@@ -974,18 +977,18 @@
- mocs: gwconnector.moc
- 
- #>+ 3
--gwmessagemanager.moc: $(srcdir)/gwmessagemanager.h
--	$(MOC) $(srcdir)/gwmessagemanager.h -o gwmessagemanager.moc
-+gwcontact.moc: $(srcdir)/gwcontact.h
-+	$(MOC) $(srcdir)/gwcontact.h -o gwcontact.moc
- 
- #>+ 2
--mocs: gwmessagemanager.moc
-+mocs: gwcontact.moc
- 
- #>+ 3
--gwcontact.moc: $(srcdir)/gwcontact.h
--	$(MOC) $(srcdir)/gwcontact.h -o gwcontact.moc
-+gwmessagemanager.moc: $(srcdir)/gwmessagemanager.h
-+	$(MOC) $(srcdir)/gwmessagemanager.h -o gwmessagemanager.moc
- 
- #>+ 2
--mocs: gwcontact.moc
-+mocs: gwmessagemanager.moc
- 
- #>+ 3
- gwcontactlist.moc: $(srcdir)/gwcontactlist.h
-@@ -996,7 +999,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  gwprotocol.moc gwaccount.moc gwbytestream.moc gwconnector.moc gwmessagemanager.moc gwcontact.moc gwcontactlist.moc
-+	-rm -f  gwaccount.moc gwprotocol.moc gwbytestream.moc gwconnector.moc gwcontact.moc gwmessagemanager.moc gwcontactlist.moc
- 
- #>+ 2
- KDE_DIST=DESIGN gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am 
-@@ -1047,7 +1050,7 @@
- 
- 
- #>+ 11
--kopete_groupwise_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwprotocol.cpp $(srcdir)/gwcontact.cpp $(srcdir)/gwaccount.cpp $(srcdir)/gwbytestream.cpp $(srcdir)/gwconnector.cpp $(srcdir)/gwmessagemanager.cpp $(srcdir)/gwcontactlist.cpp  gwaccount.moc gwprotocol.moc gwbytestream.moc gwconnector.moc gwcontact.moc gwmessagemanager.moc gwcontactlist.moc
-+kopete_groupwise_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwprotocol.cpp $(srcdir)/gwcontact.cpp $(srcdir)/gwaccount.cpp $(srcdir)/gwbytestream.cpp $(srcdir)/gwconnector.cpp $(srcdir)/gwmessagemanager.cpp $(srcdir)/gwcontactlist.cpp  gwprotocol.moc gwaccount.moc gwbytestream.moc gwconnector.moc gwmessagemanager.moc gwcontact.moc gwcontactlist.moc
- 	@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; \
-@@ -1088,8 +1091,8 @@
- gwbytestream.o: gwbytestream.moc 
- gwconnector.o: gwconnector.moc 
- gwaccount.lo: gwaccount.moc 
--gwprotocol.o: gwprotocol.moc 
- gwmessagemanager.o: gwmessagemanager.moc 
-+gwprotocol.o: gwprotocol.moc 
- gwbytestream.lo: gwbytestream.moc 
- nmcheck: 
- gwcontact.o: gwcontact.moc 
 --- kopete/protocols/groupwise/ui/Makefile.in
 +++ kopete/protocols/groupwise/ui/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -237,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22799,7 +48871,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -280,6 +284,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -291,12 +296,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -315,10 +317,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -327,6 +332,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -403,12 +409,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -460,7 +469,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22808,7 +48939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -498,9 +507,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22822,7 +48953,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/irc/icons/Makefile.in
 +++ kopete/protocols/irc/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22832,7 +48971,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22841,7 +49039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22853,54 +49051,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -584,31 +587,31 @@
- 
- #>+ 27
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_op.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_away.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_channel.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_voice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_online.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_op.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/irc_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_voice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_server.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_channel.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_normal.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_normal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_server.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/irc_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_normal.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/irc/libkirc/Makefile.in
 +++ kopete/protocols/irc/libkirc/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -137,6 +137,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -233,6 +234,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22910,7 +49071,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -276,6 +280,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -287,12 +292,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -311,10 +313,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -323,6 +328,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -399,12 +405,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -451,7 +460,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22919,7 +49139,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -489,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22931,59 +49151,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -770,36 +773,36 @@
- mocs: kirctransferserver.moc
- 
- #>+ 3
--kircengine.moc: $(srcdir)/kircengine.h
--	$(MOC) $(srcdir)/kircengine.h -o kircengine.moc
-+kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
-+	$(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
- 
- #>+ 2
--mocs: kircengine.moc
-+mocs: kirctransferhandler.moc
- 
- #>+ 3
--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: kircmessage.moc
-+mocs: kircengine.moc
- 
- #>+ 3
--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 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
-@@ -269,6 +269,9 @@
+@@ -173,6 +173,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -269,6 +270,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22993,7 +49171,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -312,6 +316,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -323,12 +328,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -347,10 +349,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -359,6 +364,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -435,12 +441,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -502,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23002,7 +49239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -540,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23014,77 +49251,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -990,18 +993,18 @@
- mocs: ircchannelcontact.moc
- 
- #>+ 3
--irccontactmanager.moc: $(srcdir)/irccontactmanager.h
--	$(MOC) $(srcdir)/irccontactmanager.h -o irccontactmanager.moc
-+ircsignalhandler.moc: $(srcdir)/ircsignalhandler.h
-+	$(MOC) $(srcdir)/ircsignalhandler.h -o ircsignalhandler.moc
- 
- #>+ 2
--mocs: irccontactmanager.moc
-+mocs: ircsignalhandler.moc
- 
- #>+ 3
--ircsignalhandler.moc: $(srcdir)/ircsignalhandler.h
--	$(MOC) $(srcdir)/ircsignalhandler.h -o ircsignalhandler.moc
-+irccontactmanager.moc: $(srcdir)/irccontactmanager.h
-+	$(MOC) $(srcdir)/irccontactmanager.h -o irccontactmanager.moc
- 
- #>+ 2
--mocs: ircsignalhandler.moc
-+mocs: irccontactmanager.moc
- 
- #>+ 3
- ircguiclient.moc: $(srcdir)/ircguiclient.h
-@@ -1018,18 +1021,18 @@
- mocs: irccontact.moc
- 
- #>+ 3
--ircservercontact.moc: $(srcdir)/ircservercontact.h
--	$(MOC) $(srcdir)/ircservercontact.h -o ircservercontact.moc
-+kcodecaction.moc: $(srcdir)/kcodecaction.h
-+	$(MOC) $(srcdir)/kcodecaction.h -o kcodecaction.moc
- 
- #>+ 2
--mocs: ircservercontact.moc
-+mocs: kcodecaction.moc
- 
- #>+ 3
--kcodecaction.moc: $(srcdir)/kcodecaction.h
--	$(MOC) $(srcdir)/kcodecaction.h -o kcodecaction.moc
-+ircservercontact.moc: $(srcdir)/ircservercontact.h
-+	$(MOC) $(srcdir)/ircservercontact.h -o ircservercontact.moc
- 
- #>+ 2
--mocs: kcodecaction.moc
-+mocs: ircservercontact.moc
- 
- #>+ 3
- ircusercontact.moc: $(srcdir)/ircusercontact.h
-@@ -1068,7 +1071,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  ircchannelcontact.moc irccontactmanager.moc ircsignalhandler.moc ircguiclient.moc irccontact.moc ircservercontact.moc kcodecaction.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
-+	-rm -f  ircchannelcontact.moc ircsignalhandler.moc irccontactmanager.moc ircguiclient.moc irccontact.moc kcodecaction.moc ircservercontact.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
- 
- #>+ 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 
-@@ -1119,7 +1122,7 @@
- 
- 
- #>+ 11
--kopete_irc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ircaccount.cpp $(srcdir)/ircaddcontactpage.cpp $(srcdir)/ircchannelcontact.cpp $(srcdir)/irccontact.cpp $(srcdir)/ircguiclient.cpp $(srcdir)/ircprotocol.cpp $(srcdir)/ircservercontact.cpp $(srcdir)/ircsignalhandler.cpp $(srcdir)/irctransferhandler.cpp $(srcdir)/ircusercontact.cpp $(srcdir)/irccontactmanager.cpp $(srcdir)/kcodecaction.cpp $(srcdir)/ksparser.cpp  ircchannelcontact.moc ircsignalhandler.moc irccontactmanager.moc irccontact.moc ircguiclient.moc kcodecaction.moc ircservercontact.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
-+kopete_irc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ircaccount.cpp $(srcdir)/ircaddcontactpage.cpp $(srcdir)/ircchannelcontact.cpp $(srcdir)/irccontact.cpp $(srcdir)/ircguiclient.cpp $(srcdir)/ircprotocol.cpp $(srcdir)/ircservercontact.cpp $(srcdir)/ircsignalhandler.cpp $(srcdir)/irctransferhandler.cpp $(srcdir)/ircusercontact.cpp $(srcdir)/irccontactmanager.cpp $(srcdir)/kcodecaction.cpp $(srcdir)/ksparser.cpp  ircchannelcontact.moc irccontactmanager.moc ircsignalhandler.moc irccontact.moc ircguiclient.moc ircservercontact.moc kcodecaction.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
- 	@echo 'creating kopete_irc_la.all_cpp.cpp ...'; \
- 	rm -f kopete_irc_la.all_cpp.files kopete_irc_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
 --- kopete/protocols/irc/ui/Makefile.in
 +++ kopete/protocols/irc/ui/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -231,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23094,7 +49271,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -274,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -285,12 +290,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -309,10 +311,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -321,6 +326,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -442,7 +451,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23103,7 +49339,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +489,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23117,7 +49353,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/icons/Makefile.in
 +++ kopete/protocols/jabber/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23127,7 +49371,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23136,7 +49439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23148,153 +49451,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -577,87 +580,87 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=hi16-action-jabber_original.png hi16-action-jabber_away.png cr16-action-jabber_invisible.png cr48-app-jabber_protocol.png cr16-action-jabber_xa.png cr16-action-jabber_connecting.mng hi16-action-jabber_invisible.png hi16-action-jabber_online.png hi16-action-jabber_xa.png hi16-action-jabber_raw.png cr16-action-jabber_away.png cr16-action-jabber_serv_off.png hi48-app-jabber_protocol.png cr16-action-jabber_offline.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-action-jabber_online.png cr16-action-jabber_group.png hi16-app-jabber_protocol.png Makefile.in hi16-action-jabber_connecting.mng hi16-action-jabber_serv_on.png cr16-action-jabber_original.png cr16-action-jabber_serv_on.png cr16-action-jabber_chatty.png hi16-action-jabber_group.png cr16-app-jabber_protocol.png hi16-action-jabber_offline.png Makefile.am hi16-action-jabber_serv_off.png cr32-app-jabber_protocol.png 
-+KDE_DIST=hi16-action-jabber_original.png hi16-action-jabber_away.png cr16-action-jabber_invisible.png cr48-app-jabber_protocol.png cr16-action-jabber_xa.png cr16-action-jabber_connecting.mng hi16-action-jabber_invisible.png hi16-action-jabber_xa.png hi16-action-jabber_online.png hi16-action-jabber_raw.png cr16-action-jabber_away.png cr16-action-jabber_serv_off.png hi48-app-jabber_protocol.png cr16-action-jabber_offline.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-action-jabber_online.png cr16-action-jabber_group.png hi16-app-jabber_protocol.png Makefile.in hi16-action-jabber_connecting.mng hi16-action-jabber_serv_on.png cr16-action-jabber_original.png cr16-action-jabber_serv_on.png cr16-action-jabber_chatty.png hi16-action-jabber_group.png cr16-app-jabber_protocol.png hi16-action-jabber_offline.png hi16-action-jabber_serv_off.png Makefile.am cr32-app-jabber_protocol.png 
- 
- #>+ 2
- docs-am:
- 
- #>+ 76
- install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_invisible.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/jabber_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_na.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_xa.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_off.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_original.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/jabber_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_invisible.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/jabber_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_na.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_xa.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_off.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_original.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/jabber_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/jabber/kioslave/Makefile.in
 +++ kopete/protocols/jabber/kioslave/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -250,6 +251,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23304,7 +49471,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -293,6 +297,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -304,12 +309,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -328,10 +330,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -340,6 +345,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -416,12 +422,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -467,7 +476,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23313,7 +49539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -505,9 +514,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23327,7 +49553,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/jabber/libiris/cutestuff/Makefile.in
 +++ kopete/protocols/jabber/libiris/cutestuff/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23337,7 +49571,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23346,7 +49639,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23360,7 +49653,15 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
 +++ kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -229,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23370,7 +49671,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -272,6 +276,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -283,12 +288,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,10 +309,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -319,6 +324,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -395,12 +401,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23379,7 +49739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23391,47 +49751,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -728,18 +731,18 @@
- mocs: ndns.moc
- 
- #>+ 3
--socks.moc: $(srcdir)/socks.h
--	$(MOC) $(srcdir)/socks.h -o socks.moc
-+httpconnect.moc: $(srcdir)/httpconnect.h
-+	$(MOC) $(srcdir)/httpconnect.h -o httpconnect.moc
- 
- #>+ 2
--mocs: socks.moc
-+mocs: httpconnect.moc
- 
- #>+ 3
--httpconnect.moc: $(srcdir)/httpconnect.h
--	$(MOC) $(srcdir)/httpconnect.h -o httpconnect.moc
-+socks.moc: $(srcdir)/socks.h
-+	$(MOC) $(srcdir)/socks.h -o socks.moc
- 
- #>+ 2
--mocs: httpconnect.moc
-+mocs: socks.moc
- 
- #>+ 3
- httppoll.moc: $(srcdir)/httppoll.h
-@@ -764,10 +767,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  srvresolver.moc ndns.moc socks.moc httpconnect.moc httppoll.moc servsock.moc bsocket.moc
-+	-rm -f  srvresolver.moc ndns.moc httpconnect.moc socks.moc httppoll.moc servsock.moc bsocket.moc
- 
- #>+ 2
--KDE_DIST=bsocket.h ndns.h httppoll.h httpconnect.h socks.h srvresolver.h servsock.h Makefile.in Makefile.am 
-+KDE_DIST=bsocket.h ndns.h httpconnect.h httppoll.h socks.h srvresolver.h servsock.h Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
 +++ kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -231,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23441,7 +49771,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -274,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -285,12 +290,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -309,10 +311,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -321,6 +326,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23450,7 +49839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23464,7 +49853,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/include/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/include/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -230,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23474,7 +49871,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -273,6 +277,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -284,12 +289,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -308,10 +310,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -320,6 +325,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -396,12 +402,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -433,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23483,7 +49939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23497,7 +49953,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -231,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23507,7 +49971,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -274,6 +278,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -285,12 +290,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -309,10 +311,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -321,6 +326,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -397,12 +403,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -437,7 +446,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23516,7 +50039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -475,9 +484,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23530,7 +50053,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23540,7 +50071,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23549,7 +50139,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23563,7 +50153,15 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -242,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23573,7 +50171,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -285,6 +289,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -296,12 +301,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -320,10 +322,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -332,6 +337,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -408,12 +414,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -463,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23582,7 +50239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23596,7 +50253,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
 +++ kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -229,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23606,7 +50271,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -272,6 +276,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -283,12 +288,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,10 +309,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -319,6 +324,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -395,12 +401,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -438,7 +447,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23615,7 +50339,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -476,9 +485,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23629,7 +50353,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/libiris/Makefile.in
 +++ kopete/protocols/jabber/libiris/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23639,7 +50371,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23648,7 +50439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23662,7 +50453,15 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/qca/Makefile.in
 +++ kopete/protocols/jabber/libiris/qca/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -213,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23672,7 +50471,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -256,6 +260,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -267,12 +272,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -291,10 +293,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -303,6 +308,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -379,12 +385,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23681,7 +50539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23695,7 +50553,15 @@
  mostlyclean-libtool:
 --- kopete/protocols/jabber/libiris/qca/src/Makefile.in
 +++ kopete/protocols/jabber/libiris/qca/src/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -226,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23705,7 +50571,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -269,6 +273,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -280,12 +285,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,10 +306,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -316,6 +321,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -392,12 +398,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23714,7 +50639,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23728,7 +50653,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/jabber/Makefile.in
 +++ kopete/protocols/jabber/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -193,6 +193,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -289,6 +290,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23738,7 +50671,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -332,6 +336,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -343,12 +348,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,10 +369,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -379,6 +384,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -455,12 +461,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23747,7 +50739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +588,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23759,52 +50751,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1054,18 +1057,18 @@
- mocs: jabbergroupchatmanager.moc
- 
- #>+ 3
--jabbercontact.moc: $(srcdir)/jabbercontact.h
--	$(MOC) $(srcdir)/jabbercontact.h -o jabbercontact.moc
-+jabberformtranslator.moc: $(srcdir)/jabberformtranslator.h
-+	$(MOC) $(srcdir)/jabberformtranslator.h -o jabberformtranslator.moc
- 
- #>+ 2
--mocs: jabbercontact.moc
-+mocs: jabberformtranslator.moc
- 
- #>+ 3
--jabberformtranslator.moc: $(srcdir)/jabberformtranslator.h
--	$(MOC) $(srcdir)/jabberformtranslator.h -o jabberformtranslator.moc
-+jabbercontact.moc: $(srcdir)/jabbercontact.h
-+	$(MOC) $(srcdir)/jabbercontact.h -o jabbercontact.moc
- 
- #>+ 2
--mocs: jabberformtranslator.moc
-+mocs: jabbercontact.moc
- 
- #>+ 3
- jabberprotocol.moc: $(srcdir)/jabberprotocol.h
-@@ -1118,7 +1121,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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 
-@@ -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  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; \
 --- kopete/protocols/jabber/ui/Makefile.in
 +++ kopete/protocols/jabber/ui/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -237,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23814,7 +50771,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -280,6 +284,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -291,12 +296,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -315,10 +317,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -327,6 +332,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -403,12 +409,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23823,7 +50839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23835,76 +50851,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -783,13 +786,6 @@
- mocs: dlgjabbervcard.moc
- 
- #>+ 3
--dlgjabberbrowse.moc: $(srcdir)/dlgjabberbrowse.h
--	$(MOC) $(srcdir)/dlgjabberbrowse.h -o dlgjabberbrowse.moc
--
--#>+ 2
--mocs: dlgjabberbrowse.moc
--
--#>+ 3
- dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
- 	$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
- 
-@@ -804,6 +800,13 @@
- mocs: dlgjabberchangepassword.moc
- 
- #>+ 3
-+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: dlgjabbersendraw.moc
-+mocs: jabberchooseserver.moc
- 
- #>+ 3
--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 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 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)/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
-@@ -213,6 +213,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -213,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23914,7 +50871,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -256,6 +260,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -267,12 +272,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -291,10 +293,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -303,6 +308,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -379,12 +385,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -414,7 +423,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23923,7 +50939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -452,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23937,7 +50953,15 @@
  mostlyclean-libtool:
 --- kopete/protocols/meanwhile/icons/Makefile.in
 +++ kopete/protocols/meanwhile/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23947,7 +50971,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23956,7 +51039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23968,56 +51051,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -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
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_away.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/cr22-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-meanwhile_protocol.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/meanwhile_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/meanwhile_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/meanwhile_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/crsc-app-meanwhile_protocol.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/meanwhile_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/meanwhile_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/meanwhile_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/meanwhile_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/meanwhile_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/meanwhile/Makefile.in
 +++ kopete/protocols/meanwhile/Makefile.in
 @@ -64,18 +64,17 @@
@@ -24042,7 +51075,15 @@
  	meanwhileplugin.lo
  @KDE_USE_FINAL_FALSE at kopete_meanwhile_la_OBJECTS = $(kopete_meanwhile_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE at kopete_meanwhile_la_OBJECTS = $(kopete_meanwhile_la_final_OBJECTS)
-@@ -268,6 +267,9 @@
+@@ -172,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -268,6 +268,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24052,7 +51093,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +467,6 @@
+@@ -311,6 +314,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -322,12 +326,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -358,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -434,12 +439,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -465,7 +473,6 @@
  	-I$(srcdir)/ui \
  	-I./ui \
  	$(all_includes) \
@@ -24060,7 +51160,7 @@
  	$(MEANWHILE_CFLAGS)
  
  noinst_HEADERS = \
-@@ -474,7 +475,7 @@
+@@ -474,7 +481,7 @@
  	meanwhileeditaccountwidget.h \
  	meanwhileaccount.h \
  	meanwhilecontact.h \
@@ -24069,7 +51169,7 @@
  	meanwhileplugin.h
  
  kde_module_LTLIBRARIES = kopete_meanwhile.la
-@@ -484,7 +485,7 @@
+@@ -484,7 +491,7 @@
  	meanwhileeditaccountwidget.cpp \
  	meanwhileaccount.cpp \
  	meanwhilecontact.cpp \
@@ -24078,7 +51178,7 @@
  	meanwhileplugin.cpp
  
  #>- kopete_meanwhile_la_LDFLAGS = -no-undefined -module \
-@@ -494,7 +495,7 @@
+@@ -494,7 +501,7 @@
  	$(KDE_PLUGIN) $(all_libraries) 
  
  kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
@@ -24087,7 +51187,7 @@
  
  service_DATA = kopete_meanwhile.desktop
  servicedir = $(kde_servicesdir)
-@@ -504,7 +505,7 @@
+@@ -504,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24096,7 +51196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -542,9 +543,9 @@
+@@ -542,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24108,7 +51208,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -589,9 +590,9 @@
+@@ -589,9 +596,9 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileaddcontactpage.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhilecontact.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileeditaccountwidget.Plo at am__quote@
@@ -24119,7 +51219,7 @@
  
  .cpp.o:
  @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -961,6 +962,13 @@
+@@ -961,6 +968,13 @@
  mocs: meanwhileeditaccountwidget.moc
  
  #>+ 3
@@ -24133,7 +51233,7 @@
  meanwhileprotocol.moc: $(srcdir)/meanwhileprotocol.h
  	$(MOC) $(srcdir)/meanwhileprotocol.h -o meanwhileprotocol.moc
  
-@@ -975,15 +983,8 @@
+@@ -975,15 +989,8 @@
  mocs: meanwhileaccount.moc
  
  #>+ 3
@@ -24150,7 +51250,7 @@
  
  #>+ 2
  KDE_DIST=meanwhileserver.h log.h meanwhileserver.cpp kopete_meanwhile.desktop Makefile.in Makefile.am 
-@@ -1034,11 +1035,11 @@
+@@ -1034,11 +1041,11 @@
  
  
  #>+ 11
@@ -24164,7 +51264,7 @@
  	  echo "#include \"$$file\"" >> kopete_meanwhile_la.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kopete_meanwhile_la.all_cpp.final; \
  	done; \
-@@ -1072,15 +1073,15 @@
+@@ -1072,15 +1079,15 @@
  #>+ 15
  meanwhileprotocol.o: meanwhileprotocol.moc 
  meanwhileaddcontactpage.o: meanwhileaddcontactpage.moc 
@@ -24184,7 +51284,15 @@
  meanwhilecontact.o: meanwhilecontact.moc 
 --- kopete/protocols/meanwhile/ui/Makefile.in
 +++ kopete/protocols/meanwhile/ui/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -230,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24194,7 +51302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -273,6 +277,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -284,12 +289,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -308,10 +310,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -320,6 +325,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -396,12 +402,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -436,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24203,7 +51370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -474,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24217,7 +51384,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/msn/config/Makefile.in
 +++ kopete/protocols/msn/config/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24227,7 +51402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -452,7 +461,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24236,7 +51470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +499,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24250,7 +51484,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/msn/icons/Makefile.in
 +++ kopete/protocols/msn/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24260,7 +51502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24269,7 +51570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24281,86 +51582,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -585,47 +588,47 @@
- #>+ 44
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_blocked.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_phone.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_lunch.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_blocked.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_brb.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_phone.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_lunch.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_online.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_online.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/msn/Makefile.in
 +++ kopete/protocols/msn/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -188,6 +188,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -284,6 +285,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24370,7 +51602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -338,12 +343,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,10 +364,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -374,6 +379,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -450,12 +456,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24379,7 +51670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24391,84 +51682,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -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
-+msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h
-+	$(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc
- 
- #>+ 2
--mocs: msncontact.moc
-+mocs: msnfiletransfersocket.moc
- 
- #>+ 3
- msnprotocol.moc: $(srcdir)/msnprotocol.h
-@@ -1133,11 +1136,11 @@
- mocs: p2p.moc
- 
- #>+ 3
--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: webcam.moc
-+mocs: dispatcher.moc
- 
- #>+ 3
- 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: dispatcher.moc
-+mocs: webcam.moc
- 
- #>+ 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  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=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 
- 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
-@@ -229,6 +229,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -229,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24478,7 +51702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -272,6 +276,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -283,12 +288,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,10 +309,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -319,6 +324,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -395,12 +401,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24487,7 +51770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24501,7 +51784,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/msn/webcam/libmimic/Makefile.in
 +++ kopete/protocols/msn/webcam/libmimic/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -128,6 +128,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -224,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24511,7 +51802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -267,6 +271,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -278,12 +283,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -302,10 +304,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -314,6 +319,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -390,12 +396,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -442,7 +451,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -24520,7 +51870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +489,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24534,7 +51884,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/msn/webcam/Makefile.in
 +++ kopete/protocols/msn/webcam/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24544,7 +51902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -453,7 +462,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24553,7 +51970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -491,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24565,18 +51982,17 @@
  	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
-@@ -259,6 +259,9 @@
+@@ -163,6 +163,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -259,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24586,7 +52002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -302,6 +306,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -313,12 +318,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,10 +339,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -349,6 +354,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -425,12 +431,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -474,7 +483,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24595,7 +52070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -512,9 +521,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24607,59 +52082,17 @@
  	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
-@@ -232,6 +232,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -232,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24669,7 +52102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -275,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -286,12 +291,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -310,10 +312,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -322,6 +327,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24678,7 +52170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24692,7 +52184,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/oscar/icons/Makefile.in
 +++ kopete/protocols/oscar/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24702,7 +52202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24711,7 +52270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24723,180 +52282,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -577,7 +580,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cr16-action-aim_online.png hi16-action-icq_away.png hi16-app-icq_protocol.png cr128-app-icq_protocol.png hi16-action-icq_occupied.png hi16-action-aim_offline.png cr16-app-aim_protocol.png cr16-action-aim_away.png cr128-app-aim_protocol.png cr16-action-aim_offline.png hi32-app-aim_protocol.png hi16-action-icq_dnd.png cr16-action-aim_connecting.mng hi16-action-icq_connecting.mng cr64-app-aim_protocol.png cr16-action-icq_ffc.png cr32-app-aim_protocol.png hi16-action-aim_connecting.mng hi32-app-icq_protocol.png hi16-action-icq_ffc.png hi16-action-icq_online.png cr16-action-icq_away.png cr16-action-icq_connecting.mng hi16-action-aim_online.png cr16-action-icq_invisible.png cr16-action-icq_occupied.png hi16-action-aim_away.png cr48-app-aim_protocol.png cr32-app-icq_protocol.png cr16-action-icq_offline.png hi16-action-icq_invisible.png cr64-app-icq_protocol.png cr16-action-icq_online.png Makefile.in cr48-app-icq_protocol.png hi16-action-icq_offline.png cr16-action-icq_na.png cr16-action-icq_dnd.png hi16-action-icq_na.png hi16-app-aim_protocol.png Makefile.am cr16-app-icq_protocol.png 
-+KDE_DIST=hi16-action-icq_away.png cr16-action-aim_online.png hi16-app-icq_protocol.png cr128-app-icq_protocol.png hi16-action-icq_occupied.png hi16-action-aim_offline.png cr16-app-aim_protocol.png cr128-app-aim_protocol.png cr16-action-aim_away.png cr16-action-aim_offline.png hi32-app-aim_protocol.png hi16-action-icq_dnd.png cr16-action-aim_connecting.mng hi16-action-icq_connecting.mng cr64-app-aim_protocol.png cr16-action-icq_ffc.png cr32-app-aim_protocol.png hi16-action-aim_connecting.mng hi32-app-icq_protocol.png hi16-action-icq_ffc.png hi16-action-icq_online.png cr16-action-icq_away.png cr16-action-icq_connecting.mng hi16-action-aim_online.png cr16-action-icq_invisible.png cr16-action-icq_occupied.png hi16-action-aim_away.png cr32-app-icq_protocol.png cr48-app-aim_protocol.png cr16-action-icq_offline.png hi16-action-icq_invisible.png cr64-app-icq_protocol.png cr16-action-icq_online.png cr48-app-icq_protocol.png Makefile.in hi16-action-icq_offline.png cr16-action-icq_na.png hi16-action-icq_na.png cr16-action-icq_dnd.png hi16-app-aim_protocol.png Makefile.am cr16-app-icq_protocol.png 
- 
- #>+ 2
- docs-am:
-@@ -585,96 +588,96 @@
- #>+ 93
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
--	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_invisible.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/aim_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_occupied.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
--	$(INSTALL_DATA) $(srcdir)/cr128-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_na.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_dnd.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
--	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
--	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/icq_protocol.png
--	$(INSTALL_DATA) $(srcdir)/hi16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_away.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_offline.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_invisible.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/aim_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_occupied.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_na.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_dnd.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/icq_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_away.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_offline.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/oscar/icq/Makefile.in
 +++ kopete/protocols/oscar/icq/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -260,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24906,7 +52302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -303,6 +307,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -314,12 +319,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,10 +340,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -350,6 +355,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -426,12 +432,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -478,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24915,7 +52370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -516,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24929,7 +52384,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/oscar/icq/ui/Makefile.in
 +++ kopete/protocols/oscar/icq/ui/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -242,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24939,7 +52402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -285,6 +289,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -296,12 +301,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -320,10 +322,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -332,6 +337,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -408,12 +414,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -459,7 +468,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24948,7 +52470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -497,9 +506,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24960,18 +52482,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -771,7 +774,7 @@
- 	-rm -f  icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
- 
- #>+ 2
--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 
- 
- #>+ 11
- clean-ui:
 --- kopete/protocols/oscar/liboscar/Makefile.in
 +++ kopete/protocols/oscar/liboscar/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -182,6 +182,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -278,6 +279,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24981,7 +52502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -321,6 +325,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -332,12 +337,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -356,10 +358,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -368,6 +373,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -444,12 +450,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -498,7 +507,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -24990,7 +52570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -536,9 +545,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25002,109 +52582,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -914,18 +917,18 @@
- mocs: servicesetuptask.moc
- 
- #>+ 3
--ssimanager.moc: $(srcdir)/ssimanager.h
--	$(MOC) $(srcdir)/ssimanager.h -o ssimanager.moc
-+flapprotocol.moc: $(srcdir)/flapprotocol.h
-+	$(MOC) $(srcdir)/flapprotocol.h -o flapprotocol.moc
- 
- #>+ 2
--mocs: ssimanager.moc
-+mocs: flapprotocol.moc
- 
- #>+ 3
--flapprotocol.moc: $(srcdir)/flapprotocol.h
--	$(MOC) $(srcdir)/flapprotocol.h -o flapprotocol.moc
-+ssimanager.moc: $(srcdir)/ssimanager.h
-+	$(MOC) $(srcdir)/ssimanager.h -o ssimanager.moc
- 
- #>+ 2
--mocs: flapprotocol.moc
-+mocs: ssimanager.moc
- 
- #>+ 3
- bytestream.moc: $(srcdir)/bytestream.h
-@@ -984,13 +987,6 @@
- mocs: rateclass.moc
- 
- #>+ 3
--ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
--	$(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
--
--#>+ 2
--mocs: ownuserinfotask.moc
--
--#>+ 3
- snacprotocol.moc: $(srcdir)/snacprotocol.h
- 	$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
- 
-@@ -1005,6 +1001,13 @@
- mocs: rateinfotask.moc
- 
- #>+ 3
-+ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
-+	$(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
-+
-+#>+ 2
-+mocs: ownuserinfotask.moc
-+
-+#>+ 3
- safedelete.moc: $(srcdir)/safedelete.h
- 	$(MOC) $(srcdir)/safedelete.h -o safedelete.moc
- 
-@@ -1026,18 +1029,18 @@
- mocs: userinfotask.moc
- 
- #>+ 3
--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: ssilisttask.moc
-+mocs: connection.moc
- 
- #>+ 3
--connection.moc: $(srcdir)/connection.h
--	$(MOC) $(srcdir)/connection.h -o connection.moc
-+ssilisttask.moc: $(srcdir)/ssilisttask.h
-+	$(MOC) $(srcdir)/ssilisttask.h -o ssilisttask.moc
- 
- #>+ 2
--mocs: connection.moc
-+mocs: ssilisttask.moc
- 
- #>+ 3
- warningtask.moc: $(srcdir)/warningtask.h
-@@ -1153,10 +1156,10 @@
- 
- #>+ 3
- clean-metasources:
--	-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 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 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 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:
-@@ -1204,7 +1207,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)/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 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 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
-@@ -275,6 +275,9 @@
+@@ -179,6 +179,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -275,6 +276,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25114,7 +52602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -318,6 +322,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -329,12 +334,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -353,10 +355,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -365,6 +370,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -441,12 +447,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25123,7 +52670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25135,61 +52682,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  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
-+ssigrouptest.moc: $(srcdir)/ssigrouptest.h
-+	$(MOC) $(srcdir)/ssigrouptest.h -o ssigrouptest.moc
- 
- #>+ 2
--mocs: ssitest.moc
-+mocs: ssigrouptest.moc
- 
- #>+ 3
- 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: ssitest.moc
-+
-+#>+ 3
- kunittest.moc: $(srcdir)/kunittest.h
- 	$(MOC) $(srcdir)/kunittest.h -o kunittest.moc
- 
-@@ -830,7 +833,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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 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
-@@ -258,6 +258,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -258,6 +259,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25199,7 +52702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -312,12 +317,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,10 +338,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -348,6 +353,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -424,12 +430,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -474,7 +483,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25208,7 +52770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -512,9 +521,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25222,7 +52784,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/sms/icons/Makefile.in
 +++ kopete/protocols/sms/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25232,7 +52802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25241,7 +52870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25253,37 +52882,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -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
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/sms_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/sms_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/sms_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/sms_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/sms/Makefile.in
 +++ kopete/protocols/sms/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -166,6 +166,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -262,6 +263,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25293,7 +52902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -305,6 +309,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -316,12 +321,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -340,10 +342,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -352,6 +357,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -428,12 +434,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25302,7 +52970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25314,53 +52982,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -947,11 +950,11 @@
- mocs: smsaddcontactpage.moc
- 
- #>+ 3
--smsservice.moc: $(srcdir)/smsservice.h
--	$(MOC) $(srcdir)/smsservice.h -o smsservice.moc
-+smseditaccountwidget.moc: $(srcdir)/smseditaccountwidget.h
-+	$(MOC) $(srcdir)/smseditaccountwidget.h -o smseditaccountwidget.moc
- 
- #>+ 2
--mocs: smsservice.moc
-+mocs: smseditaccountwidget.moc
- 
- #>+ 3
- smscontact.moc: $(srcdir)/smscontact.h
-@@ -961,15 +964,15 @@
- mocs: smscontact.moc
- 
- #>+ 3
--smseditaccountwidget.moc: $(srcdir)/smseditaccountwidget.h
--	$(MOC) $(srcdir)/smseditaccountwidget.h -o smseditaccountwidget.moc
-+smsservice.moc: $(srcdir)/smsservice.h
-+	$(MOC) $(srcdir)/smsservice.h -o smsservice.moc
- 
- #>+ 2
--mocs: smseditaccountwidget.moc
-+mocs: smsservice.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsaddcontactpage.moc smsservice.moc smscontact.moc smseditaccountwidget.moc
-+	-rm -f  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsaddcontactpage.moc smseditaccountwidget.moc smscontact.moc smsservice.moc
- 
- #>+ 2
- 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
--kopete_sms_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smsaddcontactpage.cpp $(srcdir)/smscontact.cpp $(srcdir)/smseditaccountwidget.cpp $(srcdir)/smsprotocol.cpp $(srcdir)/serviceloader.cpp $(srcdir)/smsservice.cpp $(srcdir)/smsuserpreferences.cpp $(srcdir)/smsaccount.cpp  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smseditaccountwidget.moc smscontact.moc smsservice.moc smsaddcontactpage.moc
-+kopete_sms_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smsaddcontactpage.cpp $(srcdir)/smscontact.cpp $(srcdir)/smseditaccountwidget.cpp $(srcdir)/smsprotocol.cpp $(srcdir)/serviceloader.cpp $(srcdir)/smsservice.cpp $(srcdir)/smsuserpreferences.cpp $(srcdir)/smsaccount.cpp  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsservice.moc smscontact.moc smseditaccountwidget.moc smsaddcontactpage.moc
- 	@echo 'creating kopete_sms_la.all_cpp.cpp ...'; \
- 	rm -f kopete_sms_la.all_cpp.files kopete_sms_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
 --- kopete/protocols/sms/services/Makefile.in
 +++ kopete/protocols/sms/services/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -232,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25370,7 +53002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -275,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -286,12 +291,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -310,10 +312,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -322,6 +327,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -442,7 +451,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25379,7 +53070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +489,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25393,7 +53084,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/sms/ui/Makefile.in
 +++ kopete/protocols/sms/ui/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -229,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25403,7 +53102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -272,6 +276,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -283,12 +288,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,10 +309,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -319,6 +324,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -395,12 +401,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -435,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25412,7 +53170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -473,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25426,7 +53184,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/testbed/icons/Makefile.in
 +++ kopete/protocols/testbed/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25436,7 +53202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25445,7 +53270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25457,42 +53282,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -584,23 +587,23 @@
- 
- #>+ 19
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/testbed_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/testbed_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/testbed_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/testbed_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/testbed/Makefile.in
 +++ kopete/protocols/testbed/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -266,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25502,7 +53302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -309,6 +313,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -320,12 +325,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -432,12 +438,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -477,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25511,7 +53370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25523,53 +53382,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -927,18 +930,18 @@
- mocs: testbedprotocol.moc
- 
- #>+ 3
--testbedfakeserver.moc: $(srcdir)/testbedfakeserver.h
--	$(MOC) $(srcdir)/testbedfakeserver.h -o testbedfakeserver.moc
-+testbedaddcontactpage.moc: $(srcdir)/testbedaddcontactpage.h
-+	$(MOC) $(srcdir)/testbedaddcontactpage.h -o testbedaddcontactpage.moc
- 
- #>+ 2
--mocs: testbedfakeserver.moc
-+mocs: testbedaddcontactpage.moc
- 
- #>+ 3
--testbedaddcontactpage.moc: $(srcdir)/testbedaddcontactpage.h
--	$(MOC) $(srcdir)/testbedaddcontactpage.h -o testbedaddcontactpage.moc
-+testbedfakeserver.moc: $(srcdir)/testbedfakeserver.h
-+	$(MOC) $(srcdir)/testbedfakeserver.h -o testbedfakeserver.moc
- 
- #>+ 2
--mocs: testbedaddcontactpage.moc
-+mocs: testbedfakeserver.moc
- 
- #>+ 3
- testbedaccount.moc: $(srcdir)/testbedaccount.h
-@@ -963,7 +966,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  testbededitaccountwidget.moc testbedprotocol.moc testbedfakeserver.moc testbedaddcontactpage.moc testbedaccount.moc testbedcontact.moc testbedincomingmessage.moc
-+	-rm -f  testbededitaccountwidget.moc testbedprotocol.moc testbedaddcontactpage.moc testbedfakeserver.moc testbedaccount.moc testbedcontact.moc testbedincomingmessage.moc
- 
- #>+ 2
- KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am 
-@@ -1059,8 +1062,8 @@
- testbedcontact.lo: testbedcontact.moc 
- $(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h 
- testbedcontact.o: testbedcontact.moc 
--testbedaddcontactpage.lo: testbedaddcontactpage.moc 
- testbedfakeserver.o: testbedfakeserver.moc 
-+testbedaddcontactpage.lo: testbedaddcontactpage.moc 
- testbededitaccountwidget.lo: testbededitaccountwidget.moc 
- nmcheck: 
- testbedaccount.lo: testbedaccount.moc 
 --- kopete/protocols/winpopup/config/Makefile.in
 +++ kopete/protocols/winpopup/config/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25579,7 +53402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -452,7 +461,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25588,7 +53470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +499,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25602,7 +53484,15 @@
  	@$(NORMAL_INSTALL)
 --- kopete/protocols/winpopup/icons/Makefile.in
 +++ kopete/protocols/winpopup/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25612,7 +53502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25621,7 +53570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25633,42 +53582,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -584,26 +587,26 @@
- 
- #>+ 22
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/wp_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/wp_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/wp_protocol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-wp_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/wp_away.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/wp_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/wp_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/wp_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/wp_away.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/winpopup/libwinpopup/Makefile.in
 +++ kopete/protocols/winpopup/libwinpopup/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -226,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25678,7 +53602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -269,6 +273,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -280,12 +285,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,10 +306,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -316,6 +321,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -392,12 +398,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -430,7 +439,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25687,7 +53670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -468,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25701,7 +53684,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/winpopup/Makefile.in
 +++ kopete/protocols/winpopup/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -266,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25711,7 +53702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -309,6 +313,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -320,12 +325,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -432,12 +438,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -483,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25720,7 +53770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25732,64 +53782,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -952,13 +955,6 @@
- mocs: wpaccount.moc
- 
- #>+ 3
--wpcontact.moc: $(srcdir)/wpcontact.h
--	$(MOC) $(srcdir)/wpcontact.h -o wpcontact.moc
--
--#>+ 2
--mocs: wpcontact.moc
--
--#>+ 3
- wpuserinfo.moc: $(srcdir)/wpuserinfo.h
- 	$(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
- 
-@@ -966,11 +962,11 @@
- mocs: wpuserinfo.moc
- 
- #>+ 3
--wpaddcontact.moc: $(srcdir)/wpaddcontact.h
--	$(MOC) $(srcdir)/wpaddcontact.h -o wpaddcontact.moc
-+wpcontact.moc: $(srcdir)/wpcontact.h
-+	$(MOC) $(srcdir)/wpcontact.h -o wpcontact.moc
- 
- #>+ 2
--mocs: wpaddcontact.moc
-+mocs: wpcontact.moc
- 
- #>+ 3
- wpprotocol.moc: $(srcdir)/wpprotocol.h
-@@ -980,8 +976,15 @@
- mocs: wpprotocol.moc
- 
- #>+ 3
-+wpaddcontact.moc: $(srcdir)/wpaddcontact.h
-+	$(MOC) $(srcdir)/wpaddcontact.h -o wpaddcontact.moc
-+
-+#>+ 2
-+mocs: wpaddcontact.moc
-+
-+#>+ 3
- clean-metasources:
--	-rm -f  wpeditaccount.moc wpaccount.moc wpcontact.moc wpuserinfo.moc wpaddcontact.moc wpprotocol.moc
-+	-rm -f  wpeditaccount.moc wpaccount.moc wpuserinfo.moc wpcontact.moc wpprotocol.moc wpaddcontact.moc
- 
- #>+ 2
- KDE_DIST=kopete_wp.desktop Makefile.in winpopup-send.sh winpopup-install.sh Makefile.am 
-@@ -1032,7 +1035,7 @@
- 
- 
- #>+ 11
--kopete_wp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wpprotocol.cpp $(srcdir)/wpcontact.cpp $(srcdir)/wpaddcontact.cpp $(srcdir)/wpeditaccount.cpp $(srcdir)/wpaccount.cpp $(srcdir)/wpuserinfo.cpp  wpeditaccount.moc wpaccount.moc wpuserinfo.moc wpcontact.moc wpprotocol.moc wpaddcontact.moc
-+kopete_wp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wpprotocol.cpp $(srcdir)/wpcontact.cpp $(srcdir)/wpaddcontact.cpp $(srcdir)/wpeditaccount.cpp $(srcdir)/wpaccount.cpp $(srcdir)/wpuserinfo.cpp  wpeditaccount.moc wpaccount.moc wpcontact.moc wpuserinfo.moc wpaddcontact.moc wpprotocol.moc
- 	@echo 'creating kopete_wp_la.all_cpp.cpp ...'; \
- 	rm -f kopete_wp_la.all_cpp.files kopete_wp_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
 --- kopete/protocols/winpopup/ui/Makefile.in
 +++ kopete/protocols/winpopup/ui/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -229,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25799,7 +53802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -272,6 +276,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -283,12 +288,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,10 +309,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -319,6 +324,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -395,12 +401,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -436,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25808,7 +53870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -474,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25822,7 +53884,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/yahoo/icons/Makefile.in
 +++ kopete/protocols/yahoo/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25832,7 +53902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -394,7 +403,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25841,7 +53970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25853,61 +53982,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -585,37 +588,37 @@
- #>+ 34
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_mobile.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_connecting.mng
--	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_tea.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/yahoo_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_busy.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_tea.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/yahoo_protocol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_invisible.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_mobile.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
- 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/yahoo_protocol.png
--	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
- 
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_connecting.mng
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/yahoo_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_busy.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/yahoo_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_invisible.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
- 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/yahoo_protocol.png
--	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
-+	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
- 
- #>+ 15
- force-reedit:
 --- kopete/protocols/yahoo/libyahoo2/Makefile.in
 +++ kopete/protocols/yahoo/libyahoo2/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -131,6 +131,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -227,6 +228,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25917,7 +54002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -270,6 +274,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -281,12 +286,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,10 +307,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -317,6 +322,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -393,12 +399,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -433,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -25926,7 +54070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25940,7 +54084,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/protocols/yahoo/Makefile.in
 +++ kopete/protocols/yahoo/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -179,6 +179,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -275,6 +276,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25950,7 +54102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -318,6 +322,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -329,12 +334,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -353,10 +355,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -365,6 +370,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -441,12 +447,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -491,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25959,7 +54170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -529,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25971,55 +54182,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -964,13 +967,6 @@
- mocs: yahoouserinfo.moc
- 
- #>+ 3
--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
- 
-@@ -985,6 +981,13 @@
- mocs: kyahoo.moc
- 
- #>+ 3
-+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
- 
-@@ -1021,7 +1024,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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=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 $(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
-@@ -232,6 +232,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -232,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26029,7 +54202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -275,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -286,12 +291,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -310,10 +312,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -322,6 +327,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -443,7 +452,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26038,7 +54270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26052,7 +54284,15 @@
  clean-noinstLTLIBRARIES:
 --- kopete/sounds/Makefile.in
 +++ kopete/sounds/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26062,7 +54302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -404,7 +413,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26071,7 +54370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -442,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26085,7 +54384,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/Adium/Makefile.in
 +++ kopete/styles/data/Adium/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26095,7 +54402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26104,7 +54470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26118,7 +54484,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/blue/From/Makefile.in
 +++ kopete/styles/data/iChat/blue/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26128,7 +54502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26137,7 +54570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26151,7 +54584,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/blue/Makefile.in
 +++ kopete/styles/data/iChat/blue/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26161,7 +54602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26170,7 +54670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26184,7 +54684,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/blue/To/Makefile.in
 +++ kopete/styles/data/iChat/blue/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26194,7 +54702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26203,7 +54770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26217,7 +54784,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/clear/From/Makefile.in
 +++ kopete/styles/data/iChat/clear/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26227,7 +54802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26236,7 +54870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26250,7 +54884,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/clear/Makefile.in
 +++ kopete/styles/data/iChat/clear/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26260,7 +54902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26269,7 +54970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26283,7 +54984,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/clear/To/Makefile.in
 +++ kopete/styles/data/iChat/clear/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26293,7 +55002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26302,7 +55070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26316,7 +55084,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/graphite/From/Makefile.in
 +++ kopete/styles/data/iChat/graphite/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26326,7 +55102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26335,7 +55170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26349,7 +55184,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/graphite/Makefile.in
 +++ kopete/styles/data/iChat/graphite/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26359,7 +55202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26368,7 +55270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26382,7 +55284,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/graphite/To/Makefile.in
 +++ kopete/styles/data/iChat/graphite/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26392,7 +55302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26401,7 +55370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26415,7 +55384,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/green/From/Makefile.in
 +++ kopete/styles/data/iChat/green/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26425,7 +55402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26434,7 +55470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26448,7 +55484,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/green/Makefile.in
 +++ kopete/styles/data/iChat/green/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26458,7 +55502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26467,7 +55570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26481,7 +55584,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/green/To/Makefile.in
 +++ kopete/styles/data/iChat/green/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26491,7 +55602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26500,7 +55670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26514,7 +55684,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/Makefile.in
 +++ kopete/styles/data/iChat/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26524,7 +55702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26533,7 +55770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26547,7 +55784,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/orange/From/Makefile.in
 +++ kopete/styles/data/iChat/orange/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26557,7 +55802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26566,7 +55870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26580,7 +55884,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/orange/Makefile.in
 +++ kopete/styles/data/iChat/orange/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26590,7 +55902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26599,7 +55970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26613,7 +55984,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/orange/To/Makefile.in
 +++ kopete/styles/data/iChat/orange/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26623,7 +56002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26632,7 +56070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26646,7 +56084,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/pink/From/Makefile.in
 +++ kopete/styles/data/iChat/pink/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26656,7 +56102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26665,7 +56170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26679,7 +56184,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/pink/Makefile.in
 +++ kopete/styles/data/iChat/pink/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26689,7 +56202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26698,7 +56270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26712,7 +56284,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/pink/To/Makefile.in
 +++ kopete/styles/data/iChat/pink/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26722,7 +56302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26731,7 +56370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26745,7 +56384,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/purple/From/Makefile.in
 +++ kopete/styles/data/iChat/purple/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26755,7 +56402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26764,7 +56470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26778,7 +56484,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/purple/Makefile.in
 +++ kopete/styles/data/iChat/purple/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26788,7 +56502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26797,7 +56570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26811,7 +56584,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/purple/To/Makefile.in
 +++ kopete/styles/data/iChat/purple/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26821,7 +56602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26830,7 +56670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26844,7 +56684,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/yellow/From/Makefile.in
 +++ kopete/styles/data/iChat/yellow/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26854,7 +56702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26863,7 +56770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26877,7 +56784,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/yellow/Makefile.in
 +++ kopete/styles/data/iChat/yellow/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26887,7 +56802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26896,7 +56870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26910,7 +56884,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat/yellow/To/Makefile.in
 +++ kopete/styles/data/iChat/yellow/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26920,7 +56902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26929,7 +56970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26943,7 +56984,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/blue/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/blue/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26953,7 +57002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26962,7 +57070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26976,7 +57084,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/blue/Makefile.in
 +++ kopete/styles/data/iChat-Trans/blue/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26986,7 +57102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26995,7 +57170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27009,7 +57184,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/blue/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/blue/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27019,7 +57202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27028,7 +57270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27042,7 +57284,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/clear/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/clear/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27052,7 +57302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27061,7 +57370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27075,7 +57384,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/clear/Makefile.in
 +++ kopete/styles/data/iChat-Trans/clear/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27085,7 +57402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27094,7 +57470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27108,7 +57484,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/clear/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/clear/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27118,7 +57502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27127,7 +57570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27141,7 +57584,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27151,7 +57602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27160,7 +57670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27174,7 +57684,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/graphite/Makefile.in
 +++ kopete/styles/data/iChat-Trans/graphite/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27184,7 +57702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27193,7 +57770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27207,7 +57784,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27217,7 +57802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27226,7 +57870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27240,7 +57884,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/green/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/green/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27250,7 +57902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27259,7 +57970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27273,7 +57984,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/green/Makefile.in
 +++ kopete/styles/data/iChat-Trans/green/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27283,7 +58002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27292,7 +58070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27306,7 +58084,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/green/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/green/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27316,7 +58102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27325,7 +58170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27339,7 +58184,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/Makefile.in
 +++ kopete/styles/data/iChat-Trans/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27349,7 +58202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27358,7 +58270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27372,7 +58284,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/orange/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/orange/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27382,7 +58302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27391,7 +58370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27405,7 +58384,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/orange/Makefile.in
 +++ kopete/styles/data/iChat-Trans/orange/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27415,7 +58402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27424,7 +58470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27438,7 +58484,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/orange/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/orange/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27448,7 +58502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27457,7 +58570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27471,7 +58584,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/pink/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/pink/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27481,7 +58602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27490,7 +58670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27504,7 +58684,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/pink/Makefile.in
 +++ kopete/styles/data/iChat-Trans/pink/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27514,7 +58702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27523,7 +58770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27537,7 +58784,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/pink/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/pink/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27547,7 +58802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27556,7 +58870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27570,7 +58884,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/purple/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/purple/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27580,7 +58902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27589,7 +58970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27603,7 +58984,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/purple/Makefile.in
 +++ kopete/styles/data/iChat-Trans/purple/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27613,7 +59002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27622,7 +59070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27636,7 +59084,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/purple/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/purple/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27646,7 +59102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27655,7 +59170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27669,7 +59184,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
 +++ kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27679,7 +59202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27688,7 +59270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27702,7 +59284,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/yellow/Makefile.in
 +++ kopete/styles/data/iChat-Trans/yellow/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27712,7 +59302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -422,7 +431,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27721,7 +59370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27735,7 +59384,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
 +++ kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27745,7 +59402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27754,7 +59470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27768,7 +59484,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/Kopete/Makefile.in
 +++ kopete/styles/data/Kopete/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27778,7 +59502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27787,7 +59570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27801,7 +59584,15 @@
  mostlyclean-libtool:
 --- kopete/styles/data/Makefile.in
 +++ kopete/styles/data/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27811,7 +59602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27820,7 +59670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27834,7 +59684,15 @@
  mostlyclean-libtool:
 --- kopete/styles/Makefile.in
 +++ kopete/styles/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27844,7 +59702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -434,7 +443,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27853,7 +59770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27867,7 +59784,15 @@
  mostlyclean-libtool:
 --- kpf/Makefile.in
 +++ kpf/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -128,6 +128,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -224,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27877,7 +59802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -267,6 +271,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -278,12 +283,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -302,10 +304,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -314,6 +319,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -390,12 +396,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -427,7 +436,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -27886,7 +59870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -465,9 +474,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27898,33 +59882,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -805,17 +808,17 @@
- 
- #>+ 13
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
- 
- #>+ 15
- force-reedit:
 --- kpf/src/Makefile.in
 +++ kpf/src/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -173,6 +173,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -269,6 +270,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27934,7 +59902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -312,6 +316,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -323,12 +328,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -347,10 +349,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -359,6 +364,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -435,12 +441,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27943,7 +59970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27955,182 +59982,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -942,13 +945,6 @@
- 
- 
- #>+ 3
--PropertiesDialogPlugin.moc: $(srcdir)/PropertiesDialogPlugin.h
--	$(MOC) $(srcdir)/PropertiesDialogPlugin.h -o PropertiesDialogPlugin.moc
--
--#>+ 2
--mocs: PropertiesDialogPlugin.moc
--
--#>+ 3
- Server.moc: $(srcdir)/Server.h
- 	$(MOC) $(srcdir)/Server.h -o Server.moc
- 
-@@ -977,81 +973,88 @@
- mocs: Applet.moc
- 
- #>+ 3
--WebServer.moc: $(srcdir)/WebServer.h
--	$(MOC) $(srcdir)/WebServer.h -o WebServer.moc
-+ActiveMonitorWindow.moc: $(srcdir)/ActiveMonitorWindow.h
-+	$(MOC) $(srcdir)/ActiveMonitorWindow.h -o ActiveMonitorWindow.moc
- 
- #>+ 2
--mocs: WebServer.moc
-+mocs: ActiveMonitorWindow.moc
- 
- #>+ 3
--ActiveMonitorWindow.moc: $(srcdir)/ActiveMonitorWindow.h
--	$(MOC) $(srcdir)/ActiveMonitorWindow.h -o ActiveMonitorWindow.moc
-+WebServerSocket.moc: $(srcdir)/WebServerSocket.h
-+	$(MOC) $(srcdir)/WebServerSocket.h -o WebServerSocket.moc
- 
- #>+ 2
--mocs: ActiveMonitorWindow.moc
-+mocs: WebServerSocket.moc
- 
- #>+ 3
--ServerWizard.moc: $(srcdir)/ServerWizard.h
--	$(MOC) $(srcdir)/ServerWizard.h -o ServerWizard.moc
-+StartingKPFDialog.moc: $(srcdir)/StartingKPFDialog.h
-+	$(MOC) $(srcdir)/StartingKPFDialog.h -o StartingKPFDialog.moc
- 
- #>+ 2
--mocs: ServerWizard.moc
-+mocs: StartingKPFDialog.moc
- 
- #>+ 3
--WebServerSocket.moc: $(srcdir)/WebServerSocket.h
--	$(MOC) $(srcdir)/WebServerSocket.h -o WebServerSocket.moc
-+ConfigDialogPage.moc: $(srcdir)/ConfigDialogPage.h
-+	$(MOC) $(srcdir)/ConfigDialogPage.h -o ConfigDialogPage.moc
- 
- #>+ 2
--mocs: WebServerSocket.moc
-+mocs: ConfigDialogPage.moc
- 
- #>+ 3
--SingleServerConfigDialog.moc: $(srcdir)/SingleServerConfigDialog.h
--	$(MOC) $(srcdir)/SingleServerConfigDialog.h -o SingleServerConfigDialog.moc
-+BandwidthGraph.moc: $(srcdir)/BandwidthGraph.h
-+	$(MOC) $(srcdir)/BandwidthGraph.h -o BandwidthGraph.moc
- 
- #>+ 2
--mocs: SingleServerConfigDialog.moc
-+mocs: BandwidthGraph.moc
- 
- #>+ 3
--StartingKPFDialog.moc: $(srcdir)/StartingKPFDialog.h
--	$(MOC) $(srcdir)/StartingKPFDialog.h -o StartingKPFDialog.moc
-+WebServerManager.moc: $(srcdir)/WebServerManager.h
-+	$(MOC) $(srcdir)/WebServerManager.h -o WebServerManager.moc
- 
- #>+ 2
--mocs: StartingKPFDialog.moc
-+mocs: WebServerManager.moc
- 
- #>+ 3
--AppletItem.moc: $(srcdir)/AppletItem.h
--	$(MOC) $(srcdir)/AppletItem.h -o AppletItem.moc
-+PropertiesDialogPlugin.moc: $(srcdir)/PropertiesDialogPlugin.h
-+	$(MOC) $(srcdir)/PropertiesDialogPlugin.h -o PropertiesDialogPlugin.moc
- 
- #>+ 2
--mocs: AppletItem.moc
-+mocs: PropertiesDialogPlugin.moc
- 
- #>+ 3
--DirSelectWidget.moc: $(srcdir)/DirSelectWidget.h
--	$(MOC) $(srcdir)/DirSelectWidget.h -o DirSelectWidget.moc
-+WebServer.moc: $(srcdir)/WebServer.h
-+	$(MOC) $(srcdir)/WebServer.h -o WebServer.moc
- 
- #>+ 2
--mocs: DirSelectWidget.moc
-+mocs: WebServer.moc
- 
- #>+ 3
--ConfigDialogPage.moc: $(srcdir)/ConfigDialogPage.h
--	$(MOC) $(srcdir)/ConfigDialogPage.h -o ConfigDialogPage.moc
-+ServerWizard.moc: $(srcdir)/ServerWizard.h
-+	$(MOC) $(srcdir)/ServerWizard.h -o ServerWizard.moc
- 
- #>+ 2
--mocs: ConfigDialogPage.moc
-+mocs: ServerWizard.moc
- 
- #>+ 3
--BandwidthGraph.moc: $(srcdir)/BandwidthGraph.h
--	$(MOC) $(srcdir)/BandwidthGraph.h -o BandwidthGraph.moc
-+SingleServerConfigDialog.moc: $(srcdir)/SingleServerConfigDialog.h
-+	$(MOC) $(srcdir)/SingleServerConfigDialog.h -o SingleServerConfigDialog.moc
- 
- #>+ 2
--mocs: BandwidthGraph.moc
-+mocs: SingleServerConfigDialog.moc
- 
- #>+ 3
--WebServerManager.moc: $(srcdir)/WebServerManager.h
--	$(MOC) $(srcdir)/WebServerManager.h -o WebServerManager.moc
-+AppletItem.moc: $(srcdir)/AppletItem.h
-+	$(MOC) $(srcdir)/AppletItem.h -o AppletItem.moc
- 
- #>+ 2
--mocs: WebServerManager.moc
-+mocs: AppletItem.moc
-+
-+#>+ 3
-+DirSelectWidget.moc: $(srcdir)/DirSelectWidget.h
-+	$(MOC) $(srcdir)/DirSelectWidget.h -o DirSelectWidget.moc
-+
-+#>+ 2
-+mocs: DirSelectWidget.moc
- 
- #>+ 3
- WebServerManager_stub.h: WebServerManager.kidl
-@@ -1068,7 +1071,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  PropertiesDialogPlugin.moc Server.moc ActiveMonitor.moc ErrorMessageConfigDialog.moc Applet.moc WebServer.moc ActiveMonitorWindow.moc ServerWizard.moc WebServerSocket.moc SingleServerConfigDialog.moc StartingKPFDialog.moc AppletItem.moc DirSelectWidget.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc
-+	-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=KPFInterface.h System.h Makefile.in Defines.h KPFInterface.cpp Makefile.am 
-@@ -1128,7 +1131,7 @@
- 
- 
- #>+ 11
--kpf_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Utils.cpp $(srcdir)/DirectoryLister.cpp $(srcdir)/ByteRange.cpp $(srcdir)/DirSelectWidget.cpp $(srcdir)/PortValidator.cpp $(srcdir)/Request.cpp $(srcdir)/Response.cpp $(srcdir)/Resource.cpp $(srcdir)/RootValidator.cpp $(srcdir)/Server.cpp $(srcdir)/ServerPrivate.cpp $(srcdir)/ServerSocket.cpp $(srcdir)/WebServer.cpp $(srcdir)/WebServerSocket.cpp $(srcdir)/WebServerManager.cpp $(srcdir)/SingleServerConfigDialog.cpp $(srcdir)/System.cpp $(srcdir)/ConfigDialogPage.cpp $(srcdir)/ErrorMessageConfigDialog.cpp $(srcdir)/ActiveMonitor.cpp $(srcdir)/ActiveMonitorItem.cpp $(srcdir)/ActiveMonitorWindow.cpp $(srcdir)/BandwidthGraph.cpp $(srcdir)/ServerWizard.cpp $(srcdir)/AppletItem.cpp $(srcdir)/Applet.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_skel.cpp WebServer_stub.cpp WebServerManager_skel.cpp  Server.moc ErrorMessageConfigDialog.moc ActiveMonitor.moc Applet.moc ActiveMonitorWindow.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc WebServerSocket.moc AppletItem.moc ConfigDialogPage.moc DirSelectWidget.moc BandwidthGraph.moc WebServerManager.moc
-+kpf_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Utils.cpp $(srcdir)/DirectoryLister.cpp $(srcdir)/ByteRange.cpp $(srcdir)/DirSelectWidget.cpp $(srcdir)/PortValidator.cpp $(srcdir)/Request.cpp $(srcdir)/Response.cpp $(srcdir)/Resource.cpp $(srcdir)/RootValidator.cpp $(srcdir)/Server.cpp $(srcdir)/ServerPrivate.cpp $(srcdir)/ServerSocket.cpp $(srcdir)/WebServer.cpp $(srcdir)/WebServerSocket.cpp $(srcdir)/WebServerManager.cpp $(srcdir)/SingleServerConfigDialog.cpp $(srcdir)/System.cpp $(srcdir)/ConfigDialogPage.cpp $(srcdir)/ErrorMessageConfigDialog.cpp $(srcdir)/ActiveMonitor.cpp $(srcdir)/ActiveMonitorItem.cpp $(srcdir)/ActiveMonitorWindow.cpp $(srcdir)/BandwidthGraph.cpp $(srcdir)/ServerWizard.cpp $(srcdir)/AppletItem.cpp $(srcdir)/Applet.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_skel.cpp WebServer_stub.cpp WebServerManager_skel.cpp  Server.moc ErrorMessageConfigDialog.moc ActiveMonitor.moc Applet.moc ActiveMonitorWindow.moc WebServerSocket.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc AppletItem.moc DirSelectWidget.moc
- 	@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; \
-@@ -1140,7 +1143,7 @@
- 	rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
- 
- #>+ 11
--kpfpropertiesdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/PropertiesDialogPlugin.cpp $(srcdir)/StartingKPFDialog.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_stub.cpp WebServerManager_stub.cpp  PropertiesDialogPlugin.moc StartingKPFDialog.moc
-+kpfpropertiesdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/PropertiesDialogPlugin.cpp $(srcdir)/StartingKPFDialog.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_stub.cpp WebServerManager_stub.cpp  StartingKPFDialog.moc PropertiesDialogPlugin.moc
- 	@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; \
-@@ -1184,8 +1187,8 @@
- $(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h 
- ActiveMonitor.o: ActiveMonitor.moc 
- SingleServerConfigDialog.lo: SingleServerConfigDialog.moc 
--BandwidthGraph.lo: BandwidthGraph.moc 
- WebServer.o: WebServer.moc 
-+BandwidthGraph.lo: BandwidthGraph.moc 
- nmcheck-am: nmcheck
- BandwidthGraph.o: BandwidthGraph.moc 
- $(srcdir)/PortValidator.cpp: WebServer_stub.h 
 --- kppp/DB/Makefile.in
 +++ kppp/DB/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28140,7 +60002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -28149,7 +60070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28163,7 +60084,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Austria/Makefile.in
 +++ kppp/DB/Provider/Austria/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28173,7 +60102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28182,7 +60170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28196,7 +60184,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Belarus/Makefile.in
 +++ kppp/DB/Provider/Belarus/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28206,7 +60202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28215,7 +60270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28229,7 +60284,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Czech_Republic/Makefile.in
 +++ kppp/DB/Provider/Czech_Republic/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28239,7 +60302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -419,7 +428,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28248,7 +60370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -457,9 +466,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28260,18 +60382,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -618,7 +621,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28281,7 +60402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28290,7 +60470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28304,7 +60484,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/France/Makefile.in
 +++ kppp/DB/Provider/France/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28314,7 +60502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28323,7 +60570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28337,7 +60584,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Germany/Makefile.in
 +++ kppp/DB/Provider/Germany/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28347,7 +60602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28356,7 +60670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28370,7 +60684,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Ireland/Makefile.in
 +++ kppp/DB/Provider/Ireland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28380,7 +60702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28389,7 +60770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28403,7 +60784,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Makefile.in
 +++ kppp/DB/Provider/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28413,7 +60802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -412,7 +421,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -28422,7 +60870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -450,9 +453,9 @@
+@@ -450,9 +459,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28436,7 +60884,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Netherlands/Makefile.in
 +++ kppp/DB/Provider/Netherlands/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28446,7 +60902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -467,7 +476,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28455,7 +60970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -505,9 +514,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28467,18 +60982,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -666,7 +669,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28488,7 +61002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28497,7 +61070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28509,18 +61082,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -604,7 +607,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28530,7 +61102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28539,7 +61170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28553,7 +61184,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Portugal/Makefile.in
 +++ kppp/DB/Provider/Portugal/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28563,7 +61202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28572,7 +61270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28586,7 +61284,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Slovenia/Makefile.in
 +++ kppp/DB/Provider/Slovenia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28596,7 +61302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28605,7 +61370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28619,7 +61384,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Sweden/Makefile.in
 +++ kppp/DB/Provider/Sweden/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28629,7 +61402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28638,7 +61470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28652,7 +61484,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Switzerland/Makefile.in
 +++ kppp/DB/Provider/Switzerland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28662,7 +61502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28671,7 +61570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28685,7 +61584,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Taiwan/Makefile.in
 +++ kppp/DB/Provider/Taiwan/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28695,7 +61602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28704,7 +61670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28718,7 +61684,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Ukraine/Makefile.in
 +++ kppp/DB/Provider/Ukraine/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28728,7 +61702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28737,7 +61770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28751,7 +61784,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/United_Kingdom/Makefile.in
 +++ kppp/DB/Provider/United_Kingdom/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28761,7 +61802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28770,7 +61870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28784,7 +61884,15 @@
  mostlyclean-libtool:
 --- kppp/DB/Provider/Yugoslavia/Makefile.in
 +++ kppp/DB/Provider/Yugoslavia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28794,7 +61902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -414,7 +423,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28803,7 +61970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -452,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28815,18 +61982,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -613,7 +616,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28836,7 +62002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -393,7 +402,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28845,7 +62070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -431,9 +440,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28857,45 +62082,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -583,26 +586,26 @@
- 
- #>+ 22
- install-kde-icons:
--	$(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)/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
-@@ -260,6 +260,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -260,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28905,7 +62102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -303,6 +307,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -314,12 +319,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,10 +340,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -350,6 +355,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -426,12 +432,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28914,7 +62170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28928,7 +62184,15 @@
  	@$(NORMAL_INSTALL)
 --- kppp/Makefile.in
 +++ kppp/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -187,6 +187,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -283,6 +284,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28938,7 +62202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -326,6 +330,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -337,12 +342,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,10 +363,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -373,6 +378,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -449,12 +455,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -631,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28947,7 +62270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +672,9 @@
+@@ -669,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28961,7 +62284,15 @@
  	@$(NORMAL_INSTALL)
 --- kppp/pixmaps/Makefile.in
 +++ kppp/pixmaps/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28971,7 +62302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28980,7 +62370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +458,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28994,7 +62384,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Argentina/Makefile.in
 +++ kppp/Rules/Argentina/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29004,7 +62402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29013,7 +62470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29027,7 +62484,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Australia/Makefile.in
 +++ kppp/Rules/Australia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29037,7 +62502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29046,7 +62570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +458,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29060,7 +62584,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Business_1/Makefile.in
 +++ kppp/Rules/Austria/Business_1/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29070,7 +62602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29079,7 +62670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29093,7 +62684,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Business_2/Makefile.in
 +++ kppp/Rules/Austria/Business_2/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29103,7 +62702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29112,7 +62770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29126,7 +62784,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Makefile.in
 +++ kppp/Rules/Austria/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29136,7 +62802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -413,7 +422,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -29145,7 +62870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29159,7 +62884,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Minimum/Makefile.in
 +++ kppp/Rules/Austria/Minimum/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29169,7 +62902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29178,7 +62970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29192,7 +62984,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Austria/Standard/Makefile.in
 +++ kppp/Rules/Austria/Standard/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29202,7 +63002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29211,7 +63070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29225,7 +63084,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Bangladesh/Makefile.in
 +++ kppp/Rules/Bangladesh/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29235,7 +63102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29244,7 +63170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29258,7 +63184,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Belgium/Makefile.in
 +++ kppp/Rules/Belgium/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29268,7 +63202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29277,7 +63270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29291,7 +63284,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
 +++ kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29301,7 +63302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29310,7 +63370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29324,7 +63384,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Brasil/Makefile.in
 +++ kppp/Rules/Brasil/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29334,7 +63402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29343,7 +63470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29357,7 +63484,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Croatia/Makefile.in
 +++ kppp/Rules/Croatia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29367,7 +63502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29376,7 +63570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29390,7 +63584,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Czechia/Makefile.in
 +++ kppp/Rules/Czechia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29400,7 +63602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29409,7 +63670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29423,7 +63684,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Denmark/Makefile.in
 +++ kppp/Rules/Denmark/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29433,7 +63702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29442,7 +63770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +458,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29456,7 +63784,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Estonia/Makefile.in
 +++ kppp/Rules/Estonia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29466,7 +63802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29475,7 +63870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29489,7 +63884,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Finland/Makefile.in
 +++ kppp/Rules/Finland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29499,7 +63902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29508,7 +63970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29522,7 +63984,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/France/Makefile.in
 +++ kppp/Rules/France/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29532,7 +64002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29541,7 +64070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29555,7 +64084,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Germany/Makefile.in
 +++ kppp/Rules/Germany/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29565,7 +64102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -434,7 +443,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29574,7 +64170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29588,7 +64184,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Greece/Makefile.in
 +++ kppp/Rules/Greece/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29598,7 +64202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29607,7 +64270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29621,7 +64284,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/HongKong/Makefile.in
 +++ kppp/Rules/HongKong/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29631,7 +64302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29640,7 +64370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29654,7 +64384,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Hungary/Makefile.in
 +++ kppp/Rules/Hungary/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29664,7 +64402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29673,7 +64470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29687,7 +64484,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Iceland/Makefile.in
 +++ kppp/Rules/Iceland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29697,7 +64502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29706,7 +64570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29718,18 +64582,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -604,7 +607,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in Makefile.am Iceland_general.rst 
-+KDE_DIST=Makefile.in Iceland_general.rst Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kppp/Rules/India/Makefile.in
 +++ kppp/Rules/India/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29739,7 +64602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29748,7 +64670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29762,7 +64684,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Indonesia/Makefile.in
 +++ kppp/Rules/Indonesia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29772,7 +64702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29781,7 +64770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29795,7 +64784,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Ireland/Makefile.in
 +++ kppp/Rules/Ireland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29805,7 +64802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29814,7 +64870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29828,7 +64884,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Israel/Makefile.in
 +++ kppp/Rules/Israel/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29838,7 +64902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29847,7 +64970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29861,7 +64984,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Italy/Makefile.in
 +++ kppp/Rules/Italy/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29871,7 +65002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -434,7 +443,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29880,7 +65070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29892,18 +65082,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -633,7 +636,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29913,7 +65102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29922,7 +65170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29936,7 +65184,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Japan/Makefile.in
 +++ kppp/Rules/Japan/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29946,7 +65202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29955,7 +65270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29969,7 +65284,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Kazakhstan/Makefile.in
 +++ kppp/Rules/Kazakhstan/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29979,7 +65302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29988,7 +65370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30002,7 +65384,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Luxembourg/Makefile.in
 +++ kppp/Rules/Luxembourg/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30012,7 +65402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30021,7 +65470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30035,7 +65484,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Macedonia/Makefile.in
 +++ kppp/Rules/Macedonia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30045,7 +65502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30054,7 +65570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30068,7 +65584,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Makefile.in
 +++ kppp/Rules/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -129,6 +129,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -225,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30078,16 +65602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. Macedonia Slovenia SouthAfrika Denmark Italy Croatia Yugoslavia India Jamaica Australia Sweden Bangladesh Portugal France Ukraine Bosnia_and_Herzegovina Kazakhstan Iceland Malaysia Germany Switzerland Austria Spain Finland Brasil Hungary Poland Norway Israel Turkey Belgium Romania Singapore Luxembourg Japan Greece United_Kingdom Uruguay Estonia Czechia Russia Netherlands Argentina SouthAfrica Indonesia Slovakia HongKong Ireland
-+SUBDIRS =. Luxembourg Brasil Uruguay Malaysia France Iceland Greece Belgium Japan India Italy Portugal Spain Israel Switzerland HongKong Austria Norway Hungary Poland Jamaica Netherlands Russia Sweden Turkey Bangladesh Ireland Australia Indonesia Denmark Slovakia Slovenia Croatia Singapore Bosnia_and_Herzegovina Czechia Macedonia Romania Argentina Yugoslavia United_Kingdom Estonia Finland Germany SouthAfrica SouthAfrika Kazakhstan Ukraine
- pkg_DATA = TEMPLATE
- pkg_SCRIPTS = checkrules
- pkgdir = $(kde_datadir)/kppp/Rules
-@@ -428,7 +431,7 @@
+@@ -268,6 +272,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -279,12 +284,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -303,10 +305,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -315,6 +320,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -391,12 +397,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -30096,7 +65670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -466,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30110,7 +65684,15 @@
  	@$(NORMAL_INSTALL)
 --- kppp/Rules/Malaysia/Makefile.in
 +++ kppp/Rules/Malaysia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30120,7 +65702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30129,7 +65770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30143,7 +65784,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Netherlands/Makefile.in
 +++ kppp/Rules/Netherlands/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30153,7 +65802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -434,7 +443,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30162,7 +65870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30174,18 +65882,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -633,7 +636,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30195,7 +65902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30204,7 +65970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30218,7 +65984,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Poland/Makefile.in
 +++ kppp/Rules/Poland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30228,7 +66002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -413,7 +422,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30237,7 +66070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30251,7 +66084,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Portugal/Makefile.in
 +++ kppp/Rules/Portugal/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30261,7 +66102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30270,7 +66170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30284,7 +66184,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Romania/Makefile.in
 +++ kppp/Rules/Romania/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30294,7 +66202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30303,7 +66270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30317,7 +66284,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Russia/Makefile.in
 +++ kppp/Rules/Russia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30327,7 +66302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30336,7 +66370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30350,7 +66384,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Singapore/Makefile.in
 +++ kppp/Rules/Singapore/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30360,7 +66402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30369,7 +66470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30383,7 +66484,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Slovakia/Makefile.in
 +++ kppp/Rules/Slovakia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30393,7 +66502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30402,7 +66570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30416,7 +66584,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Slovenia/Makefile.in
 +++ kppp/Rules/Slovenia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30426,7 +66602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -408,7 +417,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30435,7 +66670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30449,7 +66684,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/SouthAfrica/Makefile.in
 +++ kppp/Rules/SouthAfrica/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30459,7 +66702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30468,7 +66770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30482,7 +66784,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/SouthAfrika/Makefile.in
 +++ kppp/Rules/SouthAfrika/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30492,7 +66802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30501,7 +66870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30515,7 +66884,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Spain/Makefile.in
 +++ kppp/Rules/Spain/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30525,7 +66902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -410,7 +419,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30534,7 +66970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +457,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30548,7 +66984,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Sweden/Makefile.in
 +++ kppp/Rules/Sweden/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30558,7 +67002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -413,7 +422,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30567,7 +67070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30579,18 +67082,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -612,7 +615,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30600,7 +67102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -411,7 +420,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30609,7 +67170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +458,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30623,7 +67184,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Turkey/Makefile.in
 +++ kppp/Rules/Turkey/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30633,7 +67202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30642,7 +67270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30656,7 +67284,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Ukraine/Makefile.in
 +++ kppp/Rules/Ukraine/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30666,7 +67302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30675,7 +67370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30689,7 +67384,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/United_Kingdom/Makefile.in
 +++ kppp/Rules/United_Kingdom/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30699,7 +67402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -413,7 +422,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30708,7 +67470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30722,7 +67484,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Uruguay/Makefile.in
 +++ kppp/Rules/Uruguay/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30732,7 +67502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -405,7 +414,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30741,7 +67570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +452,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30755,7 +67584,15 @@
  mostlyclean-libtool:
 --- kppp/Rules/Yugoslavia/Makefile.in
 +++ kppp/Rules/Yugoslavia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30765,7 +67602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30774,7 +67670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30786,18 +67682,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -608,7 +611,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -279,6 +279,9 @@
+@@ -183,6 +183,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -279,6 +280,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30807,7 +67702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -322,6 +326,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -333,12 +338,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,10 +359,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -369,6 +374,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -445,12 +451,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -508,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30816,7 +67770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30828,75 +67782,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1057,11 +1060,11 @@
- mocs: kfullscreenpanel.moc
- 
- #>+ 3
--kremoteview.moc: $(srcdir)/kremoteview.h
--	$(MOC) $(srcdir)/kremoteview.h -o kremoteview.moc
-+preferencesdialog.moc: $(srcdir)/preferencesdialog.h
-+	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
- 
- #>+ 2
--mocs: kremoteview.moc
-+mocs: preferencesdialog.moc
- 
- #>+ 3
- keycapturedialog.moc: $(srcdir)/keycapturedialog.h
-@@ -1071,11 +1074,11 @@
- mocs: keycapturedialog.moc
- 
- #>+ 3
--preferencesdialog.moc: $(srcdir)/preferencesdialog.h
--	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
-+kremoteview.moc: $(srcdir)/kremoteview.h
-+	$(MOC) $(srcdir)/kremoteview.h -o kremoteview.moc
- 
- #>+ 2
--mocs: preferencesdialog.moc
-+mocs: kremoteview.moc
- 
- #>+ 3
- maindialog.moc: $(srcdir)/maindialog.h
-@@ -1086,7 +1089,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  maindialogwidget.moc kservicelocator.moc krdc.moc main.moc kfullscreenpanel.moc kremoteview.moc keycapturedialog.moc preferencesdialog.moc maindialog.moc
-+	-rm -f  maindialogwidget.moc kservicelocator.moc krdc.moc main.moc kfullscreenpanel.moc preferencesdialog.moc keycapturedialog.moc kremoteview.moc maindialog.moc
- 
- #>+ 2
- 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 @@
- 
- #>+ 10
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krdc.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krdc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
- 
- #>+ 15
- force-reedit:
-@@ -1151,7 +1154,7 @@
- 
- 
- #>+ 11
--krdc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/krdc.cpp $(srcdir)/vidmode.cpp $(srcdir)/kfullscreenpanel.cpp $(srcdir)/kservicelocator.cpp $(srcdir)/keycapturedialog.cpp $(srcdir)/kremoteview.cpp $(srcdir)/smartptr.cpp $(srcdir)/hostpreferences.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/maindialogwidget.cpp $(srcdir)/maindialog.cpp hostprofiles.cpp maindialogbase.cpp keycapturewidget.cpp  maindialogwidget.moc maindialogbase.moc kservicelocator.moc keycapturewidget.moc krdc.moc main.moc kfullscreenpanel.moc preferencesdialog.moc keycapturedialog.moc kremoteview.moc maindialog.moc hostprofiles.moc
-+krdc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/krdc.cpp $(srcdir)/vidmode.cpp $(srcdir)/kfullscreenpanel.cpp $(srcdir)/kservicelocator.cpp $(srcdir)/keycapturedialog.cpp $(srcdir)/kremoteview.cpp $(srcdir)/smartptr.cpp $(srcdir)/hostpreferences.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/maindialogwidget.cpp $(srcdir)/maindialog.cpp hostprofiles.cpp maindialogbase.cpp keycapturewidget.cpp  maindialogwidget.moc maindialogbase.moc kservicelocator.moc keycapturewidget.moc krdc.moc main.moc kfullscreenpanel.moc kremoteview.moc keycapturedialog.moc preferencesdialog.moc maindialog.moc hostprofiles.moc
- 	@echo 'creating krdc.all_cpp.cpp ...'; \
- 	rm -f krdc.all_cpp.files krdc.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
 --- krdc/rdp/Makefile.in
 +++ krdc/rdp/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -137,6 +137,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -233,6 +234,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30906,7 +67802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -276,6 +280,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -287,12 +292,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -311,10 +313,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -323,6 +328,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -399,12 +405,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30915,7 +67870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30929,7 +67884,15 @@
  clean-noinstLTLIBRARIES:
 --- krdc/vnc/Makefile.in
 +++ krdc/vnc/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30939,7 +67902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,7 +458,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -455,7 +464,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -30948,7 +67970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -493,9 +496,9 @@
+@@ -493,9 +502,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30962,7 +67984,15 @@
  clean-noinstLTLIBRARIES:
 --- krfb/kcm_krfb/Makefile.in
 +++ krfb/kcm_krfb/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30972,7 +68002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -458,7 +467,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30981,7 +68070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -496,9 +505,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30993,18 +68082,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -798,7 +801,7 @@
- 	-rm -f  kcm_krfb.moc
- 
- #>+ 2
--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
-@@ -244,6 +244,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -244,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31014,7 +68102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -287,6 +291,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -298,12 +303,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,10 +324,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -334,6 +339,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -410,12 +416,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -463,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31023,7 +68170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31037,7 +68184,15 @@
  	@$(NORMAL_INSTALL)
 --- krfb/krfb/Makefile.in
 +++ krfb/krfb/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -267,6 +268,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31047,7 +68202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -310,6 +314,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -321,12 +326,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -357,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -433,12 +439,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -496,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -31056,7 +68270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31068,46 +68282,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -972,7 +975,7 @@
- 	-rm -f  invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
- 
- #>+ 2
--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:
-@@ -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
-@@ -209,6 +209,9 @@
+@@ -113,6 +113,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -209,6 +210,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31117,7 +68302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -252,6 +256,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -263,12 +268,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -287,10 +289,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -299,6 +304,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -375,12 +381,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31126,7 +68370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31140,7 +68384,15 @@
  	@$(NORMAL_INSTALL)
 --- krfb/libvncserver/Makefile.in
 +++ krfb/libvncserver/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -226,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31150,7 +68402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -269,6 +273,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -280,12 +285,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,10 +306,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -316,6 +321,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -392,12 +398,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -433,7 +442,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -31159,7 +68470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31173,7 +68484,15 @@
  clean-noinstLTLIBRARIES:
 --- krfb/Makefile.in
 +++ krfb/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -213,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31183,7 +68502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -256,6 +260,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -267,12 +272,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -291,10 +293,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -303,6 +308,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -379,12 +385,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -415,7 +424,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31192,7 +68570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -453,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31206,7 +68584,15 @@
  mostlyclean-libtool:
 --- krfb/srvloc/Makefile.in
 +++ krfb/srvloc/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -236,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31216,7 +68602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -279,6 +283,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -290,12 +295,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -314,10 +316,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -326,6 +331,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -402,12 +408,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -451,7 +460,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31225,7 +68670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -489,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31239,7 +68684,15 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/icons/Makefile.in
 +++ ksirc/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -100,6 +100,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -196,6 +197,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31249,7 +68702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -239,6 +243,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -250,12 +255,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -274,10 +276,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -286,6 +291,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -362,12 +368,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -397,7 +406,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31258,7 +68770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -435,9 +444,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31270,67 +68782,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -587,42 +590,42 @@
- 
- #>+ 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)/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)/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)$(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)/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)$(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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31340,7 +68802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31349,7 +68870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31363,7 +68884,15 @@
  mostlyclean-libtool:
 --- ksirc/img/Makefile.in
 +++ ksirc/img/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -126,6 +126,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -222,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31373,7 +68902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -265,6 +269,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -276,12 +281,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,10 +302,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -312,6 +317,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -388,12 +394,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -436,7 +445,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31382,7 +68970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -474,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31394,18 +68982,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -784,7 +787,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -244,6 +244,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -244,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31415,7 +69002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -287,6 +291,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -298,12 +303,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,10 +324,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -334,6 +339,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -410,12 +416,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -471,7 +480,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31424,7 +69070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -509,9 +518,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31438,7 +69084,15 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/KSPrefs/Makefile.in
 +++ ksirc/KSPrefs/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -238,6 +239,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31448,7 +69102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -281,6 +285,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -292,12 +297,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -316,10 +318,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -328,6 +333,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -404,12 +410,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -503,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31457,7 +69170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31471,7 +69184,15 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/KSProgress/Makefile.in
 +++ ksirc/KSProgress/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -232,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31481,7 +69202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -275,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -286,12 +291,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -310,10 +312,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -322,6 +327,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -435,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31490,7 +69270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -473,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31504,7 +69284,15 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/KSTicker/Makefile.in
 +++ ksirc/KSTicker/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -242,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31514,7 +69302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -285,6 +289,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -296,12 +301,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -320,10 +322,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -332,6 +337,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -408,12 +414,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -451,7 +460,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31523,7 +69370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -489,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31537,7 +69384,15 @@
  clean-noinstLTLIBRARIES:
 --- ksirc/Makefile.in
 +++ ksirc/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -227,6 +227,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -323,6 +324,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31547,7 +69402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -687,7 +690,7 @@
+@@ -366,6 +370,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -377,12 +382,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,10 +403,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -413,6 +418,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -489,12 +495,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -687,7 +696,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -31556,7 +69470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -725,9 +728,9 @@
+@@ -725,9 +734,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31568,158 +69482,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1356,18 +1359,18 @@
- ksirc_DEPENDENCIES = libkdeinit_ksirc.la
- 
- #>+ 3
--servercontroller.moc: $(srcdir)/servercontroller.h
--	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
-+ksircprocess.moc: $(srcdir)/ksircprocess.h
-+	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
- 
- #>+ 2
--mocs: servercontroller.moc
-+mocs: ksircprocess.moc
- 
- #>+ 3
--ksircprocess.moc: $(srcdir)/ksircprocess.h
--	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
-+servercontroller.moc: $(srcdir)/servercontroller.h
-+	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
- 
- #>+ 2
--mocs: ksircprocess.moc
-+mocs: servercontroller.moc
- 
- #>+ 3
- ioDCC.moc: $(srcdir)/ioDCC.h
-@@ -1384,13 +1387,6 @@
- mocs: ssfeprompt.moc
- 
- #>+ 3
--chanButtons.moc: $(srcdir)/chanButtons.h
--	$(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
--
--#>+ 2
--mocs: chanButtons.moc
--
--#>+ 3
- FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
- 	$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
- 
-@@ -1405,6 +1401,13 @@
- mocs: ahistlineedit.moc
- 
- #>+ 3
-+chanButtons.moc: $(srcdir)/chanButtons.h
-+	$(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
-+
-+#>+ 2
-+mocs: chanButtons.moc
-+
-+#>+ 3
- alistbox.moc: $(srcdir)/alistbox.h
- 	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
- 
-@@ -1433,13 +1436,6 @@
- mocs: ksview.moc
- 
- #>+ 3
--dccNew.moc: $(srcdir)/dccNew.h
--	$(MOC) $(srcdir)/dccNew.h -o dccNew.moc
--
--#>+ 2
--mocs: dccNew.moc
--
--#>+ 3
- ioLAG.moc: $(srcdir)/ioLAG.h
- 	$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
- 
-@@ -1447,18 +1443,18 @@
- mocs: ioLAG.moc
- 
- #>+ 3
--mditoplevel.moc: $(srcdir)/mditoplevel.h
--	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
-+dccNew.moc: $(srcdir)/dccNew.h
-+	$(MOC) $(srcdir)/dccNew.h -o dccNew.moc
- 
- #>+ 2
--mocs: mditoplevel.moc
-+mocs: dccNew.moc
- 
- #>+ 3
--topic.moc: $(srcdir)/topic.h
--	$(MOC) $(srcdir)/topic.h -o topic.moc
-+mditoplevel.moc: $(srcdir)/mditoplevel.h
-+	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
- 
- #>+ 2
--mocs: topic.moc
-+mocs: mditoplevel.moc
- 
- #>+ 3
- colorpicker.moc: $(srcdir)/colorpicker.h
-@@ -1475,6 +1471,13 @@
- mocs: objFinder.moc
- 
- #>+ 3
-+topic.moc: $(srcdir)/topic.h
-+	$(MOC) $(srcdir)/topic.h -o topic.moc
-+
-+#>+ 2
-+mocs: topic.moc
-+
-+#>+ 3
- displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
- 	$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
- 
-@@ -1503,18 +1506,18 @@
- mocs: dccToplevel.moc
- 
- #>+ 3
--toplevel.moc: $(srcdir)/toplevel.h
--	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-+NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
-+	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
- 
- #>+ 2
--mocs: toplevel.moc
-+mocs: NewWindowDialog.moc
- 
- #>+ 3
--NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
--	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
-+toplevel.moc: $(srcdir)/toplevel.h
-+	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
- 
- #>+ 2
--mocs: NewWindowDialog.moc
-+mocs: toplevel.moc
- 
- #>+ 3
- dockservercontroller.moc: $(srcdir)/dockservercontroller.h
-@@ -1539,7 +1542,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  servercontroller.moc ksircprocess.moc ioDCC.moc ssfeprompt.moc chanButtons.moc FilterRuleEditor.moc ahistlineedit.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc dccNew.moc ioLAG.moc mditoplevel.moc topic.moc colorpicker.moc objFinder.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc toplevel.moc NewWindowDialog.moc dockservercontroller.moc kstextview.moc ioNotify.moc
-+	-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=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
--libkdeinit_ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/ksparser.cpp $(srcdir)/dccManager.cpp $(srcdir)/dccToplevel.cpp $(srcdir)/dockservercontroller.cpp $(srcdir)/nickColourMaker.cpp $(srcdir)/dccNew.cpp FilterRuleWidget.cpp dccManagerbase.cpp dccNewbase.cpp  ksircprocess.moc servercontroller.moc ssfeprompt.moc ioDCC.moc ahistlineedit.moc FilterRuleEditor.moc chanButtons.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc ioLAG.moc dccNew.moc mditoplevel.moc objFinder.moc colorpicker.moc topic.moc dccNewbase.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc NewWindowDialog.moc toplevel.moc dockservercontroller.moc FilterRuleWidget.moc kstextview.moc ioNotify.moc dccManagerbase.moc
-+libkdeinit_ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/ksparser.cpp $(srcdir)/dccManager.cpp $(srcdir)/dccToplevel.cpp $(srcdir)/dockservercontroller.cpp $(srcdir)/nickColourMaker.cpp $(srcdir)/dccNew.cpp FilterRuleWidget.cpp dccManagerbase.cpp dccNewbase.cpp  servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc dccNew.moc ioLAG.moc mditoplevel.moc topic.moc objFinder.moc colorpicker.moc dccNewbase.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc toplevel.moc NewWindowDialog.moc dockservercontroller.moc FilterRuleWidget.moc kstextview.moc ioNotify.moc dccManagerbase.moc
- 	@echo 'creating libkdeinit_ksirc_la.all_cpp.cpp ...'; \
- 	rm -f libkdeinit_ksirc_la.all_cpp.files libkdeinit_ksirc_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
 --- ksirc/puke/Makefile.in
 +++ ksirc/puke/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -248,6 +249,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31729,7 +69502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -291,6 +295,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -302,12 +307,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -326,10 +328,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -338,6 +343,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -414,12 +420,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31738,7 +69570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31750,52 +69582,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -896,18 +899,18 @@
- mocs: ptablevw.moc
- 
- #>+ 3
--pmenudta.moc: $(srcdir)/pmenudta.h
--	$(MOC) $(srcdir)/pmenudta.h -o pmenudta.moc
-+ppopmenu.moc: $(srcdir)/ppopmenu.h
-+	$(MOC) $(srcdir)/ppopmenu.h -o ppopmenu.moc
- 
- #>+ 2
--mocs: pmenudta.moc
-+mocs: ppopmenu.moc
- 
- #>+ 3
--ppopmenu.moc: $(srcdir)/ppopmenu.h
--	$(MOC) $(srcdir)/ppopmenu.h -o ppopmenu.moc
-+pmenudta.moc: $(srcdir)/pmenudta.h
-+	$(MOC) $(srcdir)/pmenudta.h -o pmenudta.moc
- 
- #>+ 2
--mocs: ppopmenu.moc
-+mocs: pmenudta.moc
- 
- #>+ 3
- pkfiledialog.moc: $(srcdir)/pkfiledialog.h
-@@ -918,7 +921,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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 pmenudta.moc ppopmenu.moc pkfiledialog.moc
-+	-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 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 @@
- 
- 
- #>+ 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
- 	@echo 'creating libpuke_la.all_cpp.cpp ...'; \
- 	rm -f libpuke_la.all_cpp.files libpuke_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
 --- ktalkd/kcmktalkd/Makefile.in
 +++ ktalkd/kcmktalkd/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -245,6 +246,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31805,7 +69602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -288,6 +292,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -299,12 +304,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -323,10 +325,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -335,6 +340,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -411,12 +417,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -452,7 +461,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31814,7 +69670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +499,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31826,85 +69682,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -794,18 +797,18 @@
- mocs: answmachpage.moc
- 
- #>+ 3
--soundpage.moc: $(srcdir)/soundpage.h
--	$(MOC) $(srcdir)/soundpage.h -o soundpage.moc
-+main.moc: $(srcdir)/main.h
-+	$(MOC) $(srcdir)/main.h -o main.moc
- 
- #>+ 2
--mocs: soundpage.moc
-+mocs: main.moc
- 
- #>+ 3
--main.moc: $(srcdir)/main.h
--	$(MOC) $(srcdir)/main.h -o main.moc
-+soundpage.moc: $(srcdir)/soundpage.h
-+	$(MOC) $(srcdir)/soundpage.h -o soundpage.moc
- 
- #>+ 2
--mocs: main.moc
-+mocs: soundpage.moc
- 
- #>+ 3
- forwmachpage.moc: $(srcdir)/forwmachpage.h
-@@ -816,7 +819,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  answmachpage.moc soundpage.moc main.moc forwmachpage.moc
-+	-rm -f  answmachpage.moc main.moc soundpage.moc forwmachpage.moc
- 
- #>+ 2
- 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 @@
- 
- #>+ 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
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/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/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/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/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:
-@@ -887,7 +890,7 @@
- 
- 
- #>+ 11
--kcm_ktalkd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/soundpage.cpp $(srcdir)/answmachpage.cpp $(srcdir)/forwmachpage.cpp  answmachpage.moc forwmachpage.moc main.moc soundpage.moc
-+kcm_ktalkd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/soundpage.cpp $(srcdir)/answmachpage.cpp $(srcdir)/forwmachpage.cpp  answmachpage.moc forwmachpage.moc soundpage.moc main.moc
- 	@echo 'creating kcm_ktalkd_la.all_cpp.cpp ...'; \
- 	rm -f kcm_ktalkd_la.all_cpp.files kcm_ktalkd_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
 --- ktalkd/ktalkd/machines/Makefile.in
 +++ ktalkd/ktalkd/machines/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -241,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31914,7 +69702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -284,6 +288,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -295,12 +300,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -319,10 +321,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -331,6 +336,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -407,12 +413,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -442,7 +451,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31923,7 +69770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +489,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31937,7 +69784,15 @@
  clean-noinstLIBRARIES:
 --- ktalkd/ktalkd/Makefile.in
 +++ ktalkd/ktalkd/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -168,6 +168,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -264,6 +265,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31947,7 +69802,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -307,6 +311,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -318,12 +323,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -342,10 +344,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -354,6 +359,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -430,12 +436,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -484,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -31956,7 +69870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31968,18 +69882,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -922,7 +925,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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
-@@ -232,6 +232,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -232,6 +233,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31989,7 +69902,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -275,6 +279,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -286,12 +291,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -310,10 +312,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -322,6 +327,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -398,12 +404,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -434,7 +443,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31998,7 +69970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32012,7 +69984,15 @@
  	@$(NORMAL_INSTALL)
 --- ktalkd/mail.local/Makefile.in
 +++ ktalkd/mail.local/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -130,6 +130,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -226,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32022,7 +70002,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -269,6 +273,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -280,12 +285,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,10 +306,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -316,6 +321,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -392,12 +398,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -426,7 +435,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -32031,7 +70070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -464,9 +473,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32045,7 +70084,15 @@
  	@$(NORMAL_INSTALL)
 --- ktalkd/Makefile.in
 +++ ktalkd/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -215,6 +216,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32055,7 +70102,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -258,6 +262,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -269,12 +274,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -293,10 +295,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -305,6 +310,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -381,12 +387,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -414,7 +423,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32064,7 +70170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -452,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32078,7 +70184,15 @@
  mostlyclean-libtool:
 --- lanbrowsing/kcmlisa/Makefile.in
 +++ lanbrowsing/kcmlisa/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -256,6 +257,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32088,7 +70202,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -299,6 +303,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -310,12 +315,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -422,12 +428,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -462,7 +471,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32097,7 +70270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -500,9 +509,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32109,52 +70282,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -901,18 +904,18 @@
- 
- 
- #>+ 3
--kcmreslisa.moc: $(srcdir)/kcmreslisa.h
--	$(MOC) $(srcdir)/kcmreslisa.h -o kcmreslisa.moc
-+portsettingsbar.moc: $(srcdir)/portsettingsbar.h
-+	$(MOC) $(srcdir)/portsettingsbar.h -o portsettingsbar.moc
- 
- #>+ 2
--mocs: kcmreslisa.moc
-+mocs: portsettingsbar.moc
- 
- #>+ 3
--portsettingsbar.moc: $(srcdir)/portsettingsbar.h
--	$(MOC) $(srcdir)/portsettingsbar.h -o portsettingsbar.moc
-+kcmreslisa.moc: $(srcdir)/kcmreslisa.h
-+	$(MOC) $(srcdir)/kcmreslisa.h -o kcmreslisa.moc
- 
- #>+ 2
--mocs: portsettingsbar.moc
-+mocs: kcmreslisa.moc
- 
- #>+ 3
- kcmkiolan.moc: $(srcdir)/kcmkiolan.h
-@@ -937,7 +940,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kcmreslisa.moc portsettingsbar.moc kcmkiolan.moc kcmlisa.moc setupwizard.moc
-+	-rm -f  portsettingsbar.moc kcmreslisa.moc kcmkiolan.moc kcmlisa.moc setupwizard.moc
- 
- #>+ 2
- 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
--kcm_lanbrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/setupwizard.cpp $(srcdir)/kcmlisa.cpp $(srcdir)/kcmreslisa.cpp $(srcdir)/kcmkiolan.cpp $(srcdir)/portsettingsbar.cpp $(srcdir)/findnic.cpp  portsettingsbar.moc kcmreslisa.moc kcmkiolan.moc setupwizard.moc kcmlisa.moc
-+kcm_lanbrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/setupwizard.cpp $(srcdir)/kcmlisa.cpp $(srcdir)/kcmreslisa.cpp $(srcdir)/kcmkiolan.cpp $(srcdir)/portsettingsbar.cpp $(srcdir)/findnic.cpp  kcmreslisa.moc portsettingsbar.moc kcmkiolan.moc setupwizard.moc kcmlisa.moc
- 	@echo 'creating kcm_lanbrowser_la.all_cpp.cpp ...'; \
- 	rm -f kcm_lanbrowser_la.all_cpp.files kcm_lanbrowser_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
 --- lanbrowsing/kio_lan/Makefile.in
 +++ lanbrowsing/kio_lan/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -247,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32164,7 +70302,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -290,6 +294,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -301,12 +306,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,10 +327,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -337,6 +342,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -413,12 +419,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -463,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32173,7 +70370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32187,7 +70384,15 @@
  	@$(NORMAL_INSTALL)
 --- lanbrowsing/lisa/Makefile.in
 +++ lanbrowsing/lisa/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -163,6 +163,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -259,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32197,7 +70402,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -302,6 +306,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -313,12 +318,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,10 +339,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -349,6 +354,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -425,12 +431,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -488,7 +497,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32206,7 +70470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +535,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32220,7 +70484,15 @@
  	@$(NORMAL_INSTALL)
 --- lanbrowsing/Makefile.in
 +++ lanbrowsing/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -116,6 +116,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -212,6 +213,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32230,7 +70502,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -255,6 +259,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -266,12 +271,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -290,10 +292,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -302,6 +307,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -378,12 +384,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -409,7 +418,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32239,7 +70570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +456,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32253,7 +70584,15 @@
  mostlyclean-libtool:
 --- librss/Makefile.in
 +++ librss/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -251,6 +252,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32263,7 +70602,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -294,6 +298,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -305,12 +310,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -329,10 +331,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -341,6 +346,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -417,12 +423,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -465,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32272,7 +70670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -503,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32284,18 +70682,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -829,7 +832,7 @@
- 	-rm -f  loader.moc image.moc testlibrss.moc
- 
- #>+ 2
--KDE_DIST=tools_p.h librss.doxyfile rss-faq.html testlibrss.h Makefile.in Makefile.am 
-+KDE_DIST=librss.doxyfile tools_p.h rss-faq.html testlibrss.h Makefile.in Makefile.am 
- 
- #>+ 3
- clean-closures:
 --- Makefile.in
 +++ Makefile.in
-@@ -230,6 +230,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -230,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32305,7 +70702,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -273,6 +277,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -284,12 +289,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -308,10 +310,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -320,6 +325,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -396,12 +402,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -435,7 +444,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -32314,7 +70770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,12 +480,12 @@
+@@ -477,12 +486,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -32329,7 +70785,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -494,7 +497,7 @@
+@@ -494,7 +503,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -32338,18 +70794,26 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -1004,7 +1007,7 @@
+@@ -1004,7 +1013,7 @@
  .NOEXPORT:
  
  #>+ 2
 -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 
++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 acinclude.m4 Makefile.am Makefile.am.in 
  
  #>+ 2
  docs-am:
 --- wifi/kcmwifi/Makefile.in
 +++ wifi/kcmwifi/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -247,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32359,7 +70823,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -290,6 +294,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -301,12 +306,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,10 +327,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -337,6 +342,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -413,12 +419,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -461,7 +470,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32368,7 +70891,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -499,9 +508,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32380,52 +70903,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -801,18 +804,18 @@
- mocs: mainconfig.moc
- 
- #>+ 3
--ifconfigpage.moc: $(srcdir)/ifconfigpage.h
--	$(MOC) $(srcdir)/ifconfigpage.h -o ifconfigpage.moc
-+kcmwifi.moc: $(srcdir)/kcmwifi.h
-+	$(MOC) $(srcdir)/kcmwifi.h -o kcmwifi.moc
- 
- #>+ 2
--mocs: ifconfigpage.moc
-+mocs: kcmwifi.moc
- 
- #>+ 3
--kcmwifi.moc: $(srcdir)/kcmwifi.h
--	$(MOC) $(srcdir)/kcmwifi.h -o kcmwifi.moc
-+ifconfigpage.moc: $(srcdir)/ifconfigpage.h
-+	$(MOC) $(srcdir)/ifconfigpage.h -o ifconfigpage.moc
- 
- #>+ 2
--mocs: kcmwifi.moc
-+mocs: ifconfigpage.moc
- 
- #>+ 3
- wificonfig.moc: $(srcdir)/wificonfig.h
-@@ -823,7 +826,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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 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 $(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
-@@ -243,6 +243,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -243,6 +244,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32435,7 +70923,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -286,6 +290,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -297,12 +302,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,10 +323,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -333,6 +338,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -409,12 +415,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -457,7 +466,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32444,7 +70991,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -495,9 +504,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32458,7 +71005,15 @@
  	@$(NORMAL_INSTALL)
 --- wifi/locations/Makefile.in
 +++ wifi/locations/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32468,7 +71023,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -407,7 +416,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -32477,7 +71091,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +454,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32491,7 +71105,15 @@
  mostlyclean-libtool:
 --- wifi/Makefile.in
 +++ wifi/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -178,6 +178,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -274,6 +275,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32501,7 +71123,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -328,12 +333,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,10 +354,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -364,6 +369,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -440,12 +446,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -523,7 +532,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32510,7 +71191,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -561,9 +570,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32522,94 +71203,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -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)/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)/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
-@@ -206,6 +206,9 @@
+@@ -110,6 +110,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CPPFLAGS = @IDN_CPPFLAGS@
+ IDN_LDFLAGS = @IDN_LDFLAGS@
+@@ -206,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32619,7 +71223,66 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -249,6 +253,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -260,12 +265,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -284,10 +286,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -296,6 +301,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_gadu_FALSE = @include_gadu_FALSE@
+@@ -372,12 +378,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -415,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -32628,7 +71291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -453,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  




More information about the pkg-kde-commits mailing list