rev 4598 - trunk/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Oct 5 00:12:33 UTC 2006
Author: chrsmrtn
Date: 2006-10-05 00:11:54 +0000 (Thu, 05 Oct 2006)
New Revision: 4598
Modified:
trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-10-05 00:06:31 UTC (rev 4597)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-10-05 00:11:54 UTC (rev 4598)
@@ -28,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5973,30 +5961,15 @@
+@@ -5970,30 +5958,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)
-@@ -6056,7 +6029,7 @@
+@@ -6053,7 +6026,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6103,7 +6076,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6123,7 +6096,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +91,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6143,6 +6116,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"
-@@ -6165,15 +6139,17 @@
+@@ -6162,15 +6136,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*)
-@@ -6214,11 +6190,56 @@
+@@ -6211,11 +6187,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
-@@ -6291,15 +6312,15 @@
+@@ -6288,15 +6309,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
-@@ -6468,14 +6489,13 @@
+@@ -6465,14 +6486,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6484,7 +6504,6 @@
esac
;;
*64-bit*)
@@ -220,7 +220,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6518,6 +6537,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)
-@@ -6552,7 +6587,7 @@
+@@ -6549,7 +6584,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -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)
-@@ -6562,8 +6597,10 @@
+@@ -6559,8 +6594,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -265,7 +265,7 @@
$2=yes
fi
fi
-@@ -6589,11 +6626,16 @@
+@@ -6586,11 +6623,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +283,7 @@
else
$2=yes
fi
-@@ -6617,7 +6659,7 @@
+@@ -6614,7 +6656,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -292,7 +292,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6643,20 +6685,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.
-@@ -6676,7 +6768,7 @@
+@@ -6673,7 +6765,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
-@@ -6684,7 +6776,7 @@
+@@ -6681,7 +6773,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 :
-@@ -6750,17 +6842,19 @@
+@@ -6747,17 +6839,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -409,7 +409,7 @@
esac
else :
# compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6769,7 +6863,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
-@@ -6809,7 +6903,7 @@
+@@ -6806,7 +6900,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -427,7 +427,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6840,7 +6934,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"
-@@ -6856,7 +6950,7 @@
+@@ -6853,7 +6947,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(
-@@ -6898,20 +6992,13 @@
+@@ -6895,20 +6989,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)
-@@ -6923,13 +7010,18 @@
+@@ -6920,13 +7007,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -490,7 +490,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6985,8 +7077,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +501,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7043,7 +7135,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -510,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7059,7 +7151,7 @@
+@@ -7056,7 +7148,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -519,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7066,7 +7158,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
-@@ -7134,7 +7239,7 @@
+@@ -7131,7 +7236,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
;;
beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7140,7 +7245,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}'
-@@ -7159,7 +7264,7 @@
+@@ -7156,7 +7261,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -568,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7171,7 +7276,8 @@
+@@ -7168,7 +7273,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7198,7 +7304,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
;;
esac
;;
-@@ -7224,7 +7330,7 @@
+@@ -7221,7 +7327,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"`
-@@ -7247,20 +7353,17 @@
+@@ -7244,20 +7350,17 @@
dynamic_linker=no
;;
@@ -628,7 +628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7278,14 +7381,19 @@
+@@ -7275,14 +7378,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -650,7 +650,7 @@
esac
;;
-@@ -7305,9 +7413,9 @@
+@@ -7302,9 +7410,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
-@@ -7322,7 +7430,7 @@
+@@ -7319,7 +7427,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
-@@ -7333,7 +7441,7 @@
+@@ -7330,7 +7438,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
-@@ -7345,6 +7453,18 @@
+@@ -7342,6 +7450,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -699,7 +699,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7508,26 @@
+@@ -7385,29 +7505,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,
-@@ -7420,6 +7537,18 @@
+@@ -7417,6 +7534,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -755,7 +755,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7429,7 +7558,7 @@
+@@ -7426,7 +7555,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
-@@ -7457,8 +7586,13 @@
+@@ -7454,8 +7583,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
-@@ -7478,7 +7612,7 @@
+@@ -7475,7 +7609,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'
-@@ -7496,13 +7630,6 @@
+@@ -7493,13 +7627,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -802,7 +802,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7528,7 +7655,7 @@
+@@ -7525,7 +7652,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'
-@@ -7561,6 +7688,29 @@
+@@ -7558,6 +7685,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}'
-@@ -7574,6 +7724,11 @@
+@@ -7571,6 +7721,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7598,6 +7753,9 @@
+@@ -7595,6 +7750,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.
-@@ -7624,7 +7782,9 @@
+@@ -7621,7 +7779,9 @@
case $tagname in
CXX)
@@ -874,7 +874,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7686,7 +7846,7 @@
+@@ -7683,7 +7843,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
-@@ -7724,7 +7884,7 @@
+@@ -7721,7 +7881,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -892,7 +892,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7860,7 +8020,7 @@
+@@ -7857,7 +8017,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
-@@ -7970,7 +8130,7 @@
+@@ -7967,7 +8127,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -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'*)
-@@ -8002,7 +8162,7 @@
+@@ -7999,7 +8159,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -919,7 +919,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8189,15 @@
+@@ -8026,6 +8186,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8062,44 +8231,36 @@
+@@ -8059,44 +8228,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.*`
;;
-@@ -8115,7 +8276,7 @@
+@@ -8112,7 +8273,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
-@@ -8131,43 +8292,27 @@
+@@ -8128,43 +8289,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
-@@ -8186,32 +8331,22 @@
+@@ -8183,32 +8328,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]]'
-@@ -8232,10 +8367,13 @@
+@@ -8229,10 +8364,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1108,7 +1108,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8255,36 +8393,43 @@
+@@ -8252,36 +8390,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"
-@@ -8316,13 +8461,13 @@
+@@ -8313,13 +8458,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8341,13 +8486,13 @@
+@@ -8338,13 +8483,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -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
-@@ -8385,10 +8530,21 @@
+@@ -8382,10 +8527,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8428,7 +8584,7 @@
+@@ -8425,7 +8581,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])
-@@ -8461,36 +8617,9 @@
+@@ -8458,36 +8614,9 @@
_LT_AC_SYS_COMPILER
@@ -1290,7 +1290,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8633,9 @@
+@@ -8501,9 +8630,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])
-@@ -8515,7 +8644,7 @@
+@@ -8512,7 +8641,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
-@@ -8524,48 +8653,11 @@
+@@ -8521,48 +8650,11 @@
fi
;;
@@ -1362,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8590,7 +8682,7 @@
+@@ -8587,7 +8679,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)=
-@@ -8602,6 +8694,7 @@
+@@ -8599,6 +8691,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8712,7 @@
+@@ -8616,7 +8709,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
-@@ -8629,11 +8722,15 @@
+@@ -8626,11 +8719,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
-@@ -8644,18 +8741,18 @@
+@@ -8641,18 +8738,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1427,7 +1427,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8673,8 +8770,8 @@
+@@ -8670,8 +8767,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -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'
-@@ -8700,7 +8797,7 @@
+@@ -8697,7 +8794,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -1447,7 +1447,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8827,23 @@
+@@ -8727,8 +8824,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1473,7 +1473,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8748,7 +8860,7 @@
+@@ -8745,7 +8857,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`
-@@ -8767,8 +8879,12 @@
+@@ -8764,8 +8876,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
-@@ -8777,15 +8893,16 @@
+@@ -8774,15 +8890,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.
-@@ -8794,13 +8911,12 @@
+@@ -8791,13 +8908,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
-@@ -8809,22 +8925,32 @@
+@@ -8806,22 +8922,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
;;
-@@ -8832,12 +8958,12 @@
+@@ -8829,12 +8955,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -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
-@@ -8846,70 +8972,81 @@
+@@ -8843,70 +8969,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
-@@ -8920,14 +9057,14 @@
+@@ -8917,14 +9054,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
-@@ -8944,12 +9081,12 @@
+@@ -8941,12 +9078,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.
-@@ -8958,11 +9095,11 @@
+@@ -8955,11 +9092,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1772,7 +1772,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9109,23 @@
+@@ -8969,34 +9106,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,
-@@ -9009,17 +9135,20 @@
+@@ -9006,17 +9132,20 @@
esac
case $cc_basename in
@@ -1841,7 +1841,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9164,15 @@
+@@ -9032,12 +9161,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
;;
esac
fi
-@@ -9051,11 +9183,25 @@
+@@ -9048,11 +9180,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
-@@ -9066,9 +9212,9 @@
+@@ -9063,9 +9209,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
-@@ -9077,16 +9223,16 @@
+@@ -9074,16 +9220,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.
-@@ -9104,20 +9250,44 @@
+@@ -9101,20 +9247,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1973,7 +1973,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9315,7 @@
+@@ -9142,7 +9312,7 @@
;;
mvs*)
case $cc_basename in
@@ -1982,7 +1982,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9155,7 +9325,7 @@
+@@ -9152,7 +9322,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=
-@@ -9166,15 +9336,31 @@
+@@ -9163,15 +9333,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -2025,7 +2025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9370,14 @@
+@@ -9181,14 +9367,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)=:
-@@ -9209,7 +9395,7 @@
+@@ -9206,7 +9392,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9414,13 @@
+@@ -9225,13 +9411,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)=:
-@@ -9243,17 +9429,17 @@
+@@ -9240,17 +9426,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'
-@@ -9272,7 +9458,7 @@
+@@ -9269,7 +9455,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9479,14 @@
+@@ -9290,27 +9476,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
-@@ -9326,36 +9499,33 @@
+@@ -9323,36 +9496,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
-@@ -9363,9 +9533,9 @@
+@@ -9360,9 +9530,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'
-@@ -9375,9 +9545,9 @@
+@@ -9372,9 +9542,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2202,7 +2202,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9556,9 @@
+@@ -9383,9 +9553,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
-@@ -9401,12 +9571,63 @@
+@@ -9398,12 +9568,63 @@
;;
esac
;;
@@ -2280,7 +2280,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9664,6 @@
+@@ -9440,8 +9661,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)
-@@ -9462,7 +9681,7 @@
+@@ -9459,7 +9678,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
-@@ -9516,7 +9735,7 @@
+@@ -9513,7 +9732,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2307,7 +2307,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9553,7 +9772,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
-@@ -9592,13 +9811,37 @@
+@@ -9589,13 +9808,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'.
-@@ -9642,12 +9885,16 @@
+@@ -9639,12 +9882,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])
-@@ -9657,7 +9904,7 @@
+@@ -9654,7 +9901,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
-@@ -9665,8 +9912,10 @@
+@@ -9662,8 +9909,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2395,7 +2395,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9925,6 @@
+@@ -9673,8 +9922,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"
-@@ -9687,8 +9934,6 @@
+@@ -9684,8 +9931,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)
-@@ -9717,20 +9962,27 @@
+@@ -9714,20 +9959,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
-@@ -9742,8 +9994,6 @@
+@@ -9739,8 +9991,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)
-@@ -9753,7 +10003,7 @@
+@@ -9750,7 +10000,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'.
-@@ -9777,11 +10027,16 @@
+@@ -9774,11 +10024,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)
-@@ -9807,11 +10062,12 @@
+@@ -9804,11 +10059,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 \
-@@ -9861,7 +10117,7 @@
+@@ -9858,7 +10114,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 | \
-@@ -9927,11 +10183,11 @@
+@@ -9924,11 +10180,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=
-@@ -9962,6 +10218,12 @@
+@@ -9959,6 +10215,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
-@@ -9973,6 +10235,9 @@
+@@ -9970,6 +10232,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2538,7 +2538,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9992,7 +10257,7 @@
+@@ -9989,7 +10254,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
-@@ -10023,7 +10288,7 @@
+@@ -10020,7 +10285,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10038,7 +10303,7 @@
+@@ -10035,7 +10300,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2565,7 +2565,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10267,7 +10532,10 @@
+@@ -10264,7 +10529,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -2577,7 +2577,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10309,9 +10577,6 @@
+@@ -10306,9 +10574,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'"
-@@ -10333,14 +10598,30 @@
+@@ -10330,14 +10595,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2620,7 +2620,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10358,14 +10639,17 @@
+@@ -10355,14 +10636,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10521,6 +10805,10 @@
+@@ -10518,6 +10802,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
-@@ -10529,7 +10817,7 @@
+@@ -10526,7 +10814,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*)
;;
*)
-@@ -10554,18 +10842,28 @@
+@@ -10551,18 +10839,28 @@
;;
chorus*)
case $cc_basename in
@@ -2692,7 +2692,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10573,22 +10871,22 @@
+@@ -10570,22 +10868,22 @@
;;
esac
;;
@@ -2721,7 +2721,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10601,9 +10899,13 @@
+@@ -10598,9 +10896,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.
-@@ -10612,20 +10914,26 @@
+@@ -10609,20 +10911,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.
-@@ -10642,25 +10950,25 @@
+@@ -10639,25 +10947,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
-@@ -10674,24 +10982,15 @@
+@@ -10671,24 +10979,15 @@
;;
psos*)
;;
@@ -2826,7 +2826,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10701,12 +11000,12 @@
+@@ -10698,12 +10997,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2841,7 +2841,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10716,7 +11015,7 @@
+@@ -10713,7 +11012,7 @@
;;
tandem*)
case $cc_basename in
@@ -2850,7 +2850,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10724,7 +11023,14 @@
+@@ -10721,7 +11020,14 @@
;;
esac
;;
@@ -2866,7 +2866,7 @@
;;
vxworks*)
;;
-@@ -10771,6 +11077,11 @@
+@@ -10768,6 +11074,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.
-@@ -10787,7 +11098,7 @@
+@@ -10784,7 +11095,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
;;
-@@ -10813,6 +11124,16 @@
+@@ -10810,6 +11121,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
-@@ -10824,7 +11145,7 @@
+@@ -10821,7 +11142,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2913,7 +2913,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10847,13 +11168,20 @@
+@@ -10844,13 +11165,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.
-@@ -10868,15 +11196,15 @@
+@@ -10865,15 +11193,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2958,7 +2958,7 @@
;;
sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10882,7 +11210,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'
-@@ -10898,6 +11226,17 @@
+@@ -10895,6 +11223,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'
-@@ -10925,7 +11264,7 @@
+@@ -10922,7 +11261,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2994,7 +2994,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11273,16 @@
+@@ -10931,6 +11270,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3011,7 +3011,7 @@
])
-@@ -10958,7 +11307,10 @@
+@@ -10955,7 +11304,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'
-@@ -10984,7 +11336,7 @@
+@@ -10981,7 +11333,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -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*
-@@ -11001,7 +11353,8 @@
+@@ -10998,7 +11350,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11364,10 @@
+@@ -11008,6 +11361,10 @@
with_gnu_ld=no
fi
;;
@@ -3053,7 +3053,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11021,6 +11378,27 @@
+@@ -11018,6 +11375,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*)
-@@ -11058,7 +11436,7 @@
+@@ -11055,7 +11433,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3090,7 +3090,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11068,13 +11446,13 @@
+@@ -11065,13 +11443,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -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
-@@ -11083,23 +11461,70 @@
+@@ -11080,23 +11458,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
-@@ -11113,13 +11538,40 @@
+@@ -11110,13 +11535,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=
-@@ -11129,24 +11581,19 @@
+@@ -11126,24 +11578,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)
-@@ -11158,7 +11605,7 @@
+@@ -11155,7 +11602,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3268,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11627,21 @@
+@@ -11177,9 +11624,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3292,7 +3292,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11199,7 +11658,7 @@
+@@ -11196,7 +11655,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`
-@@ -11218,8 +11677,12 @@
+@@ -11215,8 +11674,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
-@@ -11227,30 +11690,30 @@
+@@ -11224,30 +11687,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
-@@ -11259,13 +11722,11 @@
+@@ -11256,13 +11719,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3373,7 @@
fi
fi
;;
-@@ -11278,7 +11739,7 @@
+@@ -11275,7 +11736,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3382,7 +3382,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11288,69 +11749,69 @@
+@@ -11285,69 +11746,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
;;
dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11380,8 +11841,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
-@@ -11392,7 +11853,7 @@
+@@ -11389,7 +11850,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
-@@ -11406,47 +11867,62 @@
+@@ -11403,47 +11864,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'
-@@ -11460,7 +11936,7 @@
+@@ -11457,7 +11933,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'
-@@ -11470,7 +11946,7 @@
+@@ -11467,7 +11943,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
-@@ -11493,7 +11969,8 @@
+@@ -11490,7 +11966,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -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
-@@ -11503,7 +11980,7 @@
+@@ -11500,7 +11977,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
-@@ -11514,14 +11991,14 @@
+@@ -11511,14 +11988,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -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'
-@@ -11533,13 +12010,13 @@
+@@ -11530,13 +12007,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3675,7 +3675,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12024,15 @@
+@@ -11544,21 +12021,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'
-@@ -11570,8 +12041,18 @@
+@@ -11567,8 +12038,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
;;
-@@ -11580,7 +12061,7 @@
+@@ -11577,7 +12058,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -3731,7 +3731,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11628,36 +12109,45 @@
+@@ -11625,36 +12106,45 @@
fi
;;
@@ -3798,7 +3798,7 @@
;;
uts4*)
-@@ -11675,11 +12165,6 @@
+@@ -11672,11 +12162,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3810,7 +3810,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11700,13 +12185,14 @@
+@@ -11697,13 +12182,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11834,7 +12320,7 @@
+@@ -11831,7 +12317,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3875,7 +3875,7 @@
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- config.h.in
+++ config.h.in
-@@ -300,22 +300,22 @@
+@@ -327,22 +327,22 @@
/* Define if third argument of scandir needs const */
#undef SCANDIR_NEEDS_CONST
@@ -3904,7 +3904,7 @@
#undef SIZEOF_UNSIGNED_LONG
/* Determine pointer size for SQLite */
-@@ -567,7 +567,7 @@
+@@ -618,7 +618,7 @@
kde_socklen_t) */
#undef ksize_t
@@ -3919,7 +3919,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.60a.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4609,23 +4609,57 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,376 @@
+@@ -430,42 +720,412 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
#endif
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
+#endif
-+#if HAVE_STDINT_H
-+# include <stdint.h>
- #endif
- #if HAVE_UNISTD_H
++#ifdef 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 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 compile_LIBKOPETE_COMPAT_TRUE compile_LIBKOPETE_COMPAT_FALSE 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 PKG_CONFIG IDN_CFLAGS IDN_LIBS include_jabber_TRUE include_jabber_FALSE MEANWHILE_CFLAGS MEANWHILE_LIBS include_meanwhile_TRUE include_meanwhile_FALSE include_testbed_TRUE include_testbed_FALSE GLIB_CFLAGS GLIB_LIBS include_msn_webcam_TRUE include_msn_webcam_FALSE include_smsgsm_TRUE include_smsgsm_FALSE EXPAT_LIBS ALSA_LIBS ORTP_CFLAGS ORTP_LIBS SPEEX_CFLAGS SPEEX_LIBS include_jingle_TRUE include_jingle_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
@@ -4880,6 +4914,8 @@
+LIB_SLP
+GLINC
+GLLIB
++compile_LIBKOPETE_COMPAT_TRUE
++compile_LIBKOPETE_COMPAT_FALSE
+include_smpppdcs_TRUE
+include_smpppdcs_FALSE
+LIBXSLT_LIBS
@@ -4907,22 +4943,31 @@
+SSL_INCLUDES
+SSL_LDFLAGS
+LIBSSL
++PKG_CONFIG
++IDN_CFLAGS
++IDN_LIBS
+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
++GLIB_CFLAGS
++GLIB_LIBS
+include_msn_webcam_TRUE
+include_msn_webcam_FALSE
++include_smsgsm_TRUE
++include_smsgsm_FALSE
++EXPAT_LIBS
++ALSA_LIBS
++ORTP_CFLAGS
++ORTP_LIBS
++SPEEX_CFLAGS
++SPEEX_LIBS
++include_jingle_TRUE
++include_jingle_FALSE
+YAHOO2_VERSION
+SAMPLE_CLIENT_TRUE
+SAMPLE_CLIENT_FALSE
@@ -4991,7 +5036,7 @@
# Initialize some variables set by options.
ac_init_help=
-@@ -492,34 +1141,48 @@
+@@ -492,34 +1152,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.
@@ -5047,7 +5092,7 @@
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -541,12 +1204,18 @@
+@@ -541,12 +1215,18 @@
--config-cache | -C)
cache_file=config.cache ;;
@@ -5069,7 +5114,7 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
-@@ -554,7 +1223,17 @@
+@@ -554,7 +1234,17 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5088,7 +5133,7 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1242,7 @@
+@@ -563,11 +1253,7 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5101,7 +5146,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1269,12 @@
+@@ -594,6 +1280,12 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -5114,7 +5159,7 @@
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -618,13 +1299,16 @@
+@@ -618,13 +1310,16 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -5135,7 +5180,7 @@
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1373,16 @@
+@@ -689,6 +1384,16 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -5152,7 +5197,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -745,11 +1439,7 @@
+@@ -745,11 +1450,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -5165,7 +5210,7 @@
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -758,7 +1448,7 @@
+@@ -758,7 +1459,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -5174,7 +5219,7 @@
--x)
# Obsolete; use --with-x.
-@@ -789,8 +1479,7 @@
+@@ -789,8 +1490,7 @@
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
@@ -5184,15 +5229,21 @@
export $ac_envvar ;;
*)
-@@ -810,27 +1499,19 @@
+@@ -810,27 +1510,19 @@
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
--do
++# 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`
-- case $ac_val in
++ eval ac_val=\$$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; }; };;
@@ -5202,15 +5253,9 @@
-# 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
+-do
- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
+- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5222,7 +5267,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1538,76 @@
+@@ -857,94 +1549,76 @@
test "$silent" = yes && exec 6>/dev/null
@@ -5374,7 +5419,7 @@
#
# Report the --help message.
-@@ -973,9 +1636,6 @@
+@@ -973,9 +1647,6 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
@@ -5384,7 +5429,7 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
-@@ -993,15 +1653,22 @@
+@@ -993,15 +1664,22 @@
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
@@ -5410,7 +5455,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1025,6 +1692,8 @@
+@@ -1025,6 +1703,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -5419,7 +5464,7 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1042,10 +1711,8 @@
+@@ -1042,10 +1722,8 @@
of memory)
--enable-closure delay template instantiation
--enable-nmcheck enable automatic namespace cleanness check
@@ -5432,18 +5477,7 @@
--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)
-- --enable-sametime-plugin
-- build the Kopete Sametime plugin [default=no]
-+ --disable-meanwhile disable the Kopete Meanwhile plugin (Lotus Sametime
-+ support) [default=enabled]
- --disable-testbed disable kopete testbed protocol compilation
-
- Optional Packages:
-@@ -1074,8 +1741,7 @@
+@@ -1076,8 +1754,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]
@@ -5453,8 +5487,8 @@
--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)
+@@ -1096,139 +1773,107 @@
+ --with-speex Set prefix where speex lib can be found (ex:/usr, /usr/local) default=/usr
--with-struct-callbacks use a callback structure instead of callback
functions
- --with-wifi enable support for wireless tools
@@ -5617,7 +5651,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5636,7 +5670,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -5645,7 +5679,7 @@
{
cat <<_ASUNAME
## --------- ##
-@@ -1245,7 +1879,7 @@
+@@ -1247,7 +1892,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`
@@ -5654,7 +5688,7 @@
/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 @@
+@@ -1261,6 +1906,7 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
@@ -5662,7 +5696,7 @@
} >&5
-@@ -1280,7 +1915,6 @@
+@@ -1282,7 +1928,6 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -5670,7 +5704,7 @@
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1291,7 +1925,7 @@
+@@ -1293,7 +1938,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -5679,7 +5713,7 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1313,9 +1947,7 @@
+@@ -1315,9 +1960,7 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -5690,7 +5724,7 @@
;;
esac
done
-@@ -1326,8 +1958,8 @@
+@@ -1328,8 +1971,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.
@@ -5701,7 +5735,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1340,20 +1972,34 @@
+@@ -1342,20 +1985,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -5746,7 +5780,7 @@
echo
cat <<\_ASBOX
-@@ -1364,22 +2010,28 @@
+@@ -1366,22 +2023,28 @@
echo
for ac_var in $ac_subst_vars
do
@@ -5782,7 +5816,7 @@
done | sort
echo
fi
-@@ -1391,26 +2043,24 @@
+@@ -1393,26 +2056,24 @@
## ----------- ##
_ASBOX
echo
@@ -5814,7 +5848,7 @@
# Predefined preprocessor variables.
-@@ -1441,14 +2091,17 @@
+@@ -1443,14 +2104,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -5839,7 +5873,7 @@
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 +2117,8 @@
+@@ -1466,8 +2130,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -5850,7 +5884,7 @@
esac
fi
else
-@@ -1477,12 +2130,11 @@
+@@ -1479,12 +2143,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -5866,7 +5900,7 @@
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 +2159,7 @@
+@@ -1509,8 +2172,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -5876,7 +5910,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1525,12 +2176,6 @@
+@@ -1527,12 +2189,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -5889,7 +5923,7 @@
-@@ -1547,110 +2192,165 @@
+@@ -1549,110 +2205,165 @@
@@ -6107,7 +6141,7 @@
# The aliases save the names the user supplied, while $host etc.
-@@ -1660,17 +2360,17 @@
+@@ -1662,17 +2373,17 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
test "$program_prefix" != NONE &&
@@ -6128,7 +6162,7 @@
am__api_version="1.9"
-@@ -1692,8 +2392,8 @@
+@@ -1694,8 +2405,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.
@@ -6139,7 +6173,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1715,7 +2415,7 @@
+@@ -1717,7 +2428,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6148,7 +6182,7 @@
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 +2434,22 @@
+@@ -1736,21 +2447,22 @@
;;
esac
done
@@ -6176,7 +6210,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -1762,8 +2463,8 @@
+@@ -1764,8 +2476,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
@@ -6187,7 +6221,7 @@
rm -f confinst.$$.* > /dev/null 2>&1
echo "Testtest" > confinst.$$.orig
ac_res=no
-@@ -1775,8 +2476,8 @@
+@@ -1777,8 +2489,8 @@
fi
fi
rm -f confinst.$$.*
@@ -6198,7 +6232,7 @@
fi
if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1786,8 +2487,8 @@
+@@ -1788,8 +2500,8 @@
INSTALL_SCRIPT='${INSTALL}'
fi
@@ -6209,7 +6243,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -1829,8 +2530,8 @@
+@@ -1831,8 +2543,8 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6220,7 +6254,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -1881,8 +2582,8 @@
+@@ -1883,8 +2595,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
@@ -6231,7 +6265,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1895,54 +2596,57 @@
+@@ -1897,54 +2609,57 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6310,7 +6344,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2013,8 +2717,8 @@
+@@ -2015,8 +2730,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
@@ -6321,7 +6355,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2027,32 +2731,34 @@
+@@ -2029,32 +2744,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6363,7 +6397,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2065,27 +2771,41 @@
+@@ -2067,27 +2784,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6412,7 +6446,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -2105,6 +2825,31 @@
+@@ -2107,6 +2838,31 @@
@@ -6444,7 +6478,7 @@
unset CDPATH
-@@ -2123,14 +2868,14 @@
+@@ -2125,14 +2881,14 @@
if test "x$prefix" = "xNONE"; then
@@ -6462,7 +6496,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2173,8 +2918,8 @@
+@@ -2175,8 +2931,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6473,7 +6507,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2185,8 +2930,8 @@
+@@ -2187,8 +2943,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6484,7 +6518,7 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2195,14 +2940,14 @@
+@@ -2197,14 +2953,14 @@
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
@@ -6502,7 +6536,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2245,8 +2990,8 @@
+@@ -2247,8 +3003,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6513,7 +6547,7 @@
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found!
Please check whether you installed KDE correctly.
-@@ -2257,8 +3002,8 @@
+@@ -2259,8 +3015,8 @@
{ (exit 1); exit 1; }; }
else
@@ -6524,9 +6558,9 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2281,16 +3026,16 @@
+@@ -2282,16 +3038,16 @@
+ fi
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
@@ -6547,7 +6581,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2303,13 +3048,13 @@
+@@ -2304,13 +3060,13 @@
@@ -6565,7 +6599,7 @@
val=
-@@ -2326,11 +3071,11 @@
+@@ -2327,11 +3083,11 @@
@@ -6579,7 +6613,7 @@
am_make=${MAKE-make}
-@@ -2340,8 +3085,8 @@
+@@ -2341,8 +3097,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6590,7 +6624,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2368,15 +3113,15 @@
+@@ -2369,15 +3125,15 @@
fi
@@ -6611,7 +6645,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2396,10 +3141,9 @@
+@@ -2397,10 +3153,9 @@
@@ -6624,7 +6658,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2419,18 +3163,18 @@
+@@ -2420,18 +3175,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -6650,7 +6684,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2439,12 +3183,12 @@
+@@ -2440,12 +3195,12 @@
else
kde_use_strict_options="no"
@@ -6667,7 +6701,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2453,20 +3197,21 @@
+@@ -2454,20 +3209,21 @@
else
kde_use_warnings="yes"
@@ -6694,7 +6728,7 @@
CFLAGS=" $CFLAGS"
-@@ -2478,8 +3223,8 @@
+@@ -2479,8 +3235,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
@@ -6705,7 +6739,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2492,32 +3237,34 @@
+@@ -2493,32 +3249,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6747,7 +6781,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2530,36 +3277,51 @@
+@@ -2531,36 +3289,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6809,7 +6843,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2572,74 +3334,34 @@
+@@ -2573,74 +3346,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6893,7 +6927,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2653,7 +3375,7 @@
+@@ -2654,7 +3387,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6902,7 +6936,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2664,6 +3386,7 @@
+@@ -2665,6 +3398,7 @@
fi
done
done
@@ -6910,7 +6944,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2681,22 +3404,23 @@
+@@ -2682,22 +3416,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6941,7 +6975,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2709,36 +3433,38 @@
+@@ -2710,36 +3445,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6988,7 +7022,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2751,29 +3477,45 @@
+@@ -2752,29 +3489,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7040,7 +7074,7 @@
fi
fi
-@@ -2786,21 +3528,35 @@
+@@ -2787,21 +3540,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7084,7 +7118,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2825,46 +3581,70 @@
+@@ -2826,47 +3593,77 @@
# 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.
@@ -7138,7 +7172,7 @@
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -7175,16 +7209,21 @@
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2877,19 +3657,23 @@
+
+@@ -2878,19 +3675,21 @@
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-+{ 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
+# Check that the compiler produces executables we can run. If not, either
@@ -7208,7 +7247,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2908,22 +3692,27 @@
+@@ -2909,22 +3708,27 @@
fi
fi
fi
@@ -7248,7 +7287,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2934,9 +3723,8 @@
+@@ -2935,9 +3739,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7259,7 +7298,7 @@
break;;
* ) break;;
esac
-@@ -2950,14 +3738,14 @@
+@@ -2951,14 +3754,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7278,7 +7317,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2977,14 +3765,20 @@
+@@ -2978,14 +3781,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7303,7 +7342,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3002,12 +3796,12 @@
+@@ -3003,12 +3812,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7320,7 +7359,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3030,24 +3824,36 @@
+@@ -3031,24 +3840,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7365,7 +7404,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3056,24 +3862,28 @@
+@@ -3057,24 +3878,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7402,7 +7441,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3089,24 +3899,147 @@
+@@ -3090,24 +3915,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7415,117 +7454,6 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&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
-+
-+ CFLAGS=""
-+ 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.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ 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. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -7558,69 +7486,90 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3115,12 +4048,20 @@
+@@ -3116,285 +3953,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ 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
-@@ -3136,12 +4077,12 @@
- CFLAGS=
- fi
- fi
+-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 "$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
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3175,12 +4116,17 @@
- /* 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
+ _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
-+ 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
+- 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. */
-+ that's true only with -std. */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 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];
+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -3195,205 +4141,74 @@
+ ;
return 0;
}
_ACEOF
@@ -7632,13 +7581,12 @@
-# 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__"
-+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
+-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
++rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7680,45 +7628,37 @@
(exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-+ ac_cv_prog_cc_c89=$ac_arg
++ :
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
+-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
+-CC=$ac_save_CC
++ 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. */
- fi
+-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 ;;
-+# 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; } ;;
- *)
+- *)
- 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" ;;
-+ 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
-
+-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
@@ -7766,96 +7706,244 @@
-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
--int
--main ()
--{
+ int
+ main ()
+ {
-exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++
+ ;
+ return 0;
+ }
+ _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); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++ ac_cv_prog_cc_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
-continue
--fi
++
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++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
--int
--main ()
--{
++#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];
++
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 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 0;
--}
--_ACEOF
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+ }
+ _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); } &&
++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 { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
- { (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
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
++ 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
--done
++
++rm -f core 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
--fi
--
++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
@@ -7865,7 +7953,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3402,8 +4217,8 @@
+@@ -3403,8 +4233,8 @@
depcc="$CC" am_compiler_list=
@@ -7876,7 +7964,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3492,8 +4307,8 @@
+@@ -3493,8 +4323,8 @@
fi
fi
@@ -7887,7 +7975,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3515,8 +4330,8 @@
+@@ -3516,8 +4346,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
@@ -7898,7 +7986,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3550,8 +4365,13 @@
+@@ -3551,8 +4381,13 @@
#endif
Syntax error
_ACEOF
@@ -7914,7 +8002,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3576,9 +4396,10 @@
+@@ -3577,9 +4412,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7926,7 +8014,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3588,8 +4409,13 @@
+@@ -3589,8 +4425,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7942,7 +8030,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3616,6 +4442,7 @@
+@@ -3617,6 +4458,7 @@
ac_preproc_ok=:
break
fi
@@ -7950,7 +8038,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3633,8 +4460,8 @@
+@@ -3634,8 +4476,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -7961,7 +8049,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3657,8 +4484,13 @@
+@@ -3658,8 +4500,13 @@
#endif
Syntax error
_ACEOF
@@ -7977,7 +8065,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3683,9 +4515,10 @@
+@@ -3684,9 +4531,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7989,7 +8077,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3695,8 +4528,13 @@
+@@ -3696,8 +4544,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8005,7 +8093,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3723,6 +4561,7 @@
+@@ -3724,6 +4577,7 @@
ac_preproc_ok=:
break
fi
@@ -8013,7 +8101,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3773,18 +4612,22 @@
+@@ -3774,18 +4628,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8041,7 +8129,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3797,36 +4640,38 @@
+@@ -3798,36 +4656,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8088,7 +8176,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3839,55 +4684,85 @@
+@@ -3840,55 +4700,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8192,7 +8280,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3910,24 +4785,36 @@
+@@ -3911,24 +4801,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8237,7 +8325,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3936,24 +4823,28 @@
+@@ -3937,24 +4839,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8274,7 +8362,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3969,24 +4860,36 @@
+@@ -3970,24 +4876,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8319,7 +8407,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3995,70 +4898,53 @@
+@@ -3996,70 +4914,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8414,7 +8502,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4067,61 +4953,91 @@
+@@ -4068,61 +4969,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8500,12 +8588,12 @@
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8528,7 +8616,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4130,8 +5046,8 @@
+@@ -4131,8 +5062,8 @@
depcc="$CXX" am_compiler_list=
@@ -8539,7 +8627,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4220,8 +5136,8 @@
+@@ -4221,8 +5152,8 @@
fi
fi
@@ -8550,7 +8638,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4239,8 +5155,8 @@
+@@ -4240,8 +5171,8 @@
@@ -8561,7 +8649,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4265,24 +5181,36 @@
+@@ -4266,24 +5197,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8606,7 +8694,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4291,13 +5219,14 @@
+@@ -4292,13 +5235,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8625,7 +8713,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4339,17 +5268,16 @@
+@@ -4340,17 +5284,16 @@
fi
fi
@@ -8647,7 +8735,7 @@
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'
-@@ -4377,24 +5305,36 @@
+@@ -4378,24 +5321,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8692,7 +8780,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4403,8 +5343,10 @@
+@@ -4404,8 +5359,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8700,11 +8788,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4417,29 +5359,28 @@
+@@ -4418,29 +5375,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8742,7 +8830,7 @@
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'
-@@ -4466,24 +5407,36 @@
+@@ -4467,24 +5423,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8787,7 +8875,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4492,8 +5445,10 @@
+@@ -4493,8 +5461,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8795,11 +8883,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4506,13 +5461,13 @@
+@@ -4507,13 +5477,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8817,7 +8905,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4533,16 +5488,15 @@
+@@ -4534,16 +5504,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -8838,7 +8926,7 @@
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'
-@@ -4569,24 +5523,36 @@
+@@ -4570,24 +5539,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8883,7 +8971,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4595,8 +5561,10 @@
+@@ -4596,8 +5577,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8891,11 +8979,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4609,16 +5577,16 @@
+@@ -4610,16 +5593,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8916,7 +9004,7 @@
:
fi
-@@ -4633,16 +5601,15 @@
+@@ -4634,16 +5617,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"
@@ -8937,7 +9025,7 @@
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'
-@@ -4669,24 +5636,36 @@
+@@ -4670,24 +5652,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8982,7 +9070,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4695,8 +5674,10 @@
+@@ -4696,8 +5690,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8990,11 +9078,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4709,27 +5690,26 @@
+@@ -4710,27 +5706,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9029,7 +9117,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4754,24 +5734,36 @@
+@@ -4755,24 +5750,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9074,7 +9162,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4780,8 +5772,10 @@
+@@ -4781,8 +5788,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9082,11 +9170,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
ac_ext=c
-@@ -4794,13 +5788,13 @@
+@@ -4795,13 +5804,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9104,7 +9192,7 @@
:
fi
-@@ -4808,16 +5802,15 @@
+@@ -4809,16 +5818,15 @@
;;
esac
@@ -9125,7 +9213,7 @@
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'
-@@ -4844,24 +5837,36 @@
+@@ -4845,24 +5853,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9170,7 +9258,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4870,8 +5875,10 @@
+@@ -4871,8 +5891,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9178,11 +9266,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4884,28 +5891,27 @@
+@@ -4885,28 +5907,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9219,7 +9307,7 @@
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'
-@@ -4932,24 +5938,36 @@
+@@ -4933,24 +5954,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9264,7 +9352,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4958,8 +5976,10 @@
+@@ -4959,8 +5992,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9272,11 +9360,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4972,28 +5992,27 @@
+@@ -4973,28 +6008,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9313,7 +9401,7 @@
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'
-@@ -5020,24 +6039,36 @@
+@@ -5021,24 +6055,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9358,7 +9446,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5046,8 +6077,10 @@
+@@ -5047,8 +6093,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9366,11 +9454,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5060,13 +6093,13 @@
+@@ -5061,13 +6109,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9388,7 +9476,7 @@
:
fi
-@@ -5078,13 +6111,13 @@
+@@ -5079,13 +6127,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9406,7 +9494,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5092,16 +6125,15 @@
+@@ -5093,16 +6141,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9427,7 +9515,7 @@
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,24 +6160,36 @@
+@@ -5129,24 +6176,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9472,7 +9560,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5154,8 +6198,10 @@
+@@ -5155,8 +6214,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9480,11 +9568,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5168,13 +6214,13 @@
+@@ -5169,13 +6230,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9502,7 +9590,7 @@
:
fi
-@@ -5186,16 +6232,15 @@
+@@ -5187,16 +6248,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9523,7 +9611,7 @@
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'
-@@ -5222,24 +6267,36 @@
+@@ -5223,24 +6283,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9568,7 +9656,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5248,8 +6305,10 @@
+@@ -5249,8 +6321,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9576,11 +9664,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5262,28 +6321,27 @@
+@@ -5263,28 +6337,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9617,7 +9705,7 @@
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'
-@@ -5310,24 +6368,36 @@
+@@ -5311,24 +6384,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9662,7 +9750,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5336,8 +6406,10 @@
+@@ -5337,8 +6422,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9670,11 +9758,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5350,28 +6422,27 @@
+@@ -5351,28 +6438,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9711,7 +9799,7 @@
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'
-@@ -5398,24 +6469,36 @@
+@@ -5399,24 +6485,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9756,7 +9844,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5424,8 +6507,10 @@
+@@ -5425,8 +6523,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9764,11 +9852,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5438,28 +6523,27 @@
+@@ -5439,28 +6539,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9805,7 +9893,7 @@
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'
-@@ -5486,24 +6570,36 @@
+@@ -5487,24 +6586,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9850,7 +9938,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5512,8 +6608,10 @@
+@@ -5513,8 +6624,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9858,11 +9946,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5526,13 +6624,13 @@
+@@ -5527,13 +6640,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9880,7 +9968,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5540,37 +6638,37 @@
+@@ -5541,37 +6654,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -9932,7 +10020,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5602,24 +6700,36 @@
+@@ -5603,24 +6716,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9977,7 +10065,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5628,18 +6738,19 @@
+@@ -5629,18 +6754,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9987,7 +10075,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_cflags_save"
@@ -10001,7 +10089,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5659,16 +6770,15 @@
+@@ -5660,16 +6786,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10022,7 +10110,7 @@
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'
-@@ -5695,24 +6805,36 @@
+@@ -5696,24 +6821,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10067,7 +10155,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5721,8 +6843,10 @@
+@@ -5722,8 +6859,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10075,11 +10163,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5735,29 +6859,28 @@
+@@ -5736,29 +6875,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10117,7 +10205,7 @@
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'
-@@ -5784,24 +6907,36 @@
+@@ -5785,24 +6923,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10162,7 +10250,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5810,8 +6945,10 @@
+@@ -5811,8 +6961,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10170,11 +10258,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5824,28 +6961,27 @@
+@@ -5825,28 +6977,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10211,7 +10299,7 @@
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'
-@@ -5872,24 +7008,36 @@
+@@ -5873,24 +7024,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10256,7 +10344,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5898,8 +7046,10 @@
+@@ -5899,8 +7062,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10264,11 +10352,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5912,28 +7062,27 @@
+@@ -5913,28 +7078,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10305,7 +10393,7 @@
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'
-@@ -5960,24 +7109,36 @@
+@@ -5961,24 +7125,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10350,7 +10438,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5986,8 +7147,10 @@
+@@ -5987,8 +7163,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10358,11 +10446,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6000,28 +7163,27 @@
+@@ -6001,28 +7179,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10399,7 +10487,7 @@
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'
-@@ -6048,24 +7210,36 @@
+@@ -6049,24 +7226,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10444,7 +10532,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6074,8 +7248,10 @@
+@@ -6075,8 +7264,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10452,11 +10540,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6088,28 +7264,27 @@
+@@ -6089,28 +7280,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10493,7 +10581,7 @@
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'
-@@ -6136,24 +7311,36 @@
+@@ -6137,24 +7327,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10538,7 +10626,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6162,8 +7349,10 @@
+@@ -6163,8 +7365,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10546,11 +10634,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6176,13 +7365,13 @@
+@@ -6177,13 +7381,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10568,7 +10656,7 @@
:
fi
-@@ -6289,13 +7478,13 @@
+@@ -6290,13 +7494,13 @@
fi
@@ -10585,7 +10673,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6325,8 +7514,13 @@
+@@ -6326,8 +7530,13 @@
#endif
Syntax error
_ACEOF
@@ -10601,7 +10689,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6351,9 +7545,10 @@
+@@ -6352,9 +7561,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10613,7 +10701,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6363,8 +7558,13 @@
+@@ -6364,8 +7574,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10629,7 +10717,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6391,6 +7591,7 @@
+@@ -6392,6 +7607,7 @@
ac_preproc_ok=:
break
fi
@@ -10637,7 +10725,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6408,8 +7609,8 @@
+@@ -6409,8 +7625,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10648,7 +10736,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6432,8 +7633,13 @@
+@@ -6433,8 +7649,13 @@
#endif
Syntax error
_ACEOF
@@ -10664,7 +10752,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6458,9 +7664,10 @@
+@@ -6459,9 +7680,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10676,7 +10764,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6470,8 +7677,13 @@
+@@ -6471,8 +7693,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10692,7 +10780,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6498,6 +7710,7 @@
+@@ -6499,6 +7726,7 @@
ac_preproc_ok=:
break
fi
@@ -10700,7 +10788,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6524,16 +7737,15 @@
+@@ -6525,16 +7753,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -10721,7 +10809,7 @@
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'
-@@ -6560,24 +7772,36 @@
+@@ -6561,24 +7788,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10766,7 +10854,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6586,8 +7810,10 @@
+@@ -6587,8 +7826,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10774,11 +10862,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6600,22 +7826,21 @@
+@@ -6601,22 +7842,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10807,7 +10895,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6631,36 +7856,36 @@
+@@ -6632,36 +7872,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -10854,7 +10942,7 @@
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'
-@@ -6687,24 +7912,36 @@
+@@ -6688,24 +7928,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10899,7 +10987,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6713,8 +7950,10 @@
+@@ -6714,8 +7966,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10907,11 +10995,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6727,29 +7966,28 @@
+@@ -6728,29 +7982,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10949,7 +11037,7 @@
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'
-@@ -6776,24 +8014,36 @@
+@@ -6777,24 +8030,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10994,7 +11082,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6802,8 +8052,10 @@
+@@ -6803,8 +8068,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11002,11 +11090,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6816,13 +8068,13 @@
+@@ -6817,13 +8084,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11024,7 +11112,7 @@
:
fi
-@@ -6832,13 +8084,13 @@
+@@ -6833,13 +8100,13 @@
@@ -11042,7 +11130,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6851,13 +8103,13 @@
+@@ -6852,13 +8119,13 @@
@@ -11060,7 +11148,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6868,278 +8120,99 @@
+@@ -6869,270 +8136,91 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11107,7 +11195,6 @@
+ KDE_USE_NMCHECK_TRUE="#"
+ KDE_USE_NMCHECK_FALSE=""
+ fi
-+
-int
-main ()
@@ -11155,7 +11242,18 @@
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
+-fi
+
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
+-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared; p=${PACKAGE-default}
@@ -11175,20 +11273,11 @@
+ IFS="$lt_save_ifs"
+ ;;
+ esac
-+else
+ else
+ enable_shared=yes
- fi
++fi
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
--kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then
+ enableval=$enable_static; p=${PACKAGE-default}
@@ -11208,12 +11297,10 @@
+ IFS="$lt_save_ifs"
+ ;;
+ esac
- else
++else
+ enable_static=no
+fi
-
-
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11221,15 +11308,6 @@
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+
-+ kdelibsuff="$kde_libs_suffix"
-+ if test -z "$kdelibsuff"; then
-+ kdelibsuff="no"
-+ fi
-+ # Check whether --enable-libsuffix was given.
-+if test "${enable_libsuffix+set}" = set; then
-+ enableval=$enable_libsuffix; kdelibsuff=$enableval
-+fi
- save_CXXFLAGS="$CXXFLAGS"
@@ -11240,8 +11318,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ if test "$kdelibsuff" = "auto"; then
-
+-
-int
-main ()
-{
@@ -11385,32 +11462,25 @@
-else
- enable_static=no
-fi;
+
-
-
-
--
-- kdelibsuff="$kde_libs_suffix"
-- if test -z "$kdelibsuff"; then
-- kdelibsuff="no"
-- fi
- # Check whether --enable-libsuffix or --disable-libsuffix was given.
--if test "${enable_libsuffix+set}" = set; then
++ # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+ kdelibsuff="auto"
-fi;
--
-- if test "$kdelibsuff" = "auto"; then
--
--cat > conftest.c << EOF
--#include <stdio.h>
--int main() {
-+cat > conftest.c << EOF
-+#include <stdio.h>
-+int main() {
- return 0;
- }
- EOF
-@@ -7154,8 +8227,8 @@
++fi
++
+
+ if test "$kdelibsuff" = "auto"; then
+
+@@ -7153,8 +8241,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11421,7 +11491,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7171,14 +8244,13 @@
+@@ -7170,14 +8258,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11440,22 +11510,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7197,10 +8269,11 @@
+@@ -7196,10 +8283,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 +8297,7 @@
+@@ -7223,7 +8311,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
@@ -11464,7 +11534,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7253,37 +8326,184 @@
+@@ -7252,37 +8340,184 @@
fi
SED=$lt_cv_path_SED
@@ -11472,18 +11542,12 @@
-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
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
++ 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
@@ -11556,8 +11620,11 @@
+{ 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_prog_egrep+set}" = set; then
+
-+
+{ 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
@@ -11570,8 +11637,11 @@
+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
+ 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_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11627,25 +11697,25 @@
+ { { 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
-+
+ 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_EGREP=$EGREP
+fi
+
+
+ fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
++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 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"
@@ -11666,7 +11736,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7312,11 +8532,11 @@
+@@ -7311,11 +8546,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11682,7 +11752,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7329,7 +8549,7 @@
+@@ -7328,7 +8563,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,
@@ -11691,7 +11761,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'*)
-@@ -7349,21 +8569,21 @@
+@@ -7348,21 +8583,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -11720,7 +11790,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7373,29 +8593,38 @@
+@@ -7372,29 +8607,38 @@
;;
esac
fi
@@ -11767,7 +11837,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7403,56 +8632,63 @@
+@@ -7402,56 +8646,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -11865,7 +11935,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7479,44 +8715,36 @@
+@@ -7478,44 +8729,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -11920,7 +11990,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7532,7 +8760,7 @@
+@@ -7531,7 +8774,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -11929,7 +11999,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
-@@ -7548,43 +8776,27 @@
+@@ -7547,43 +8790,27 @@
esac
;;
@@ -11986,7 +12056,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
-@@ -7603,32 +8815,22 @@
+@@ -7602,32 +8829,22 @@
;;
openbsd*)
@@ -12022,7 +12092,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]'
-@@ -7649,17 +8851,20 @@
+@@ -7648,17 +8865,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12046,7 +12116,7 @@
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 +8873,17 @@
+@@ -7667,14 +8887,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12067,16 +12137,16 @@
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 +8910,7 @@
+@@ -7701,7 +8924,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7705 "configure"' > conftest.$ac_ext
-+ echo '#line 8913 "configure"' > conftest.$ac_ext
+- echo '#line 7704 "configure"' > conftest.$ac_ext
++ echo '#line 8927 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7745,14 +8953,13 @@
+@@ -7744,14 +8967,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12093,7 +12163,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7764,7 +8971,6 @@
+@@ -7763,7 +8985,6 @@
esac
;;
*64-bit*)
@@ -12101,7 +12171,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7789,8 +8995,8 @@
+@@ -7788,8 +9009,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12112,7 +12182,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7816,24 +9022,36 @@
+@@ -7815,24 +9036,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12157,7 +12227,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7842,9 +9060,10 @@
+@@ -7841,9 +9074,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12166,11 +12236,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -7853,13 +9072,33 @@
+@@ -7852,13 +9086,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12206,7 +12276,7 @@
esac
-@@ -7867,8 +9106,8 @@
+@@ -7866,8 +9120,8 @@
@@ -12217,7 +12287,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7892,24 +9131,36 @@
+@@ -7891,24 +9145,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12262,7 +12332,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7918,9 +9169,10 @@
+@@ -7917,9 +9183,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12275,7 +12345,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7976,6 +9228,7 @@
+@@ -7975,6 +9242,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12283,7 +12353,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7995,18 +9248,27 @@
+@@ -7994,18 +9262,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12317,7 +12387,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8019,12 +9281,14 @@
+@@ -8018,12 +9295,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12335,7 +12405,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8047,9 +9311,9 @@
+@@ -8046,9 +9325,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12348,7 +12418,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8063,24 +9327,36 @@
+@@ -8062,24 +9341,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12393,7 +12463,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8089,12 +9365,14 @@
+@@ -8088,12 +9379,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12412,7 +12482,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8109,18 +9387,19 @@
+@@ -8108,18 +9401,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12440,7 +12510,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8131,24 +9410,36 @@
+@@ -8130,24 +9424,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12485,7 +12555,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8157,15 +9448,16 @@
+@@ -8156,15 +9462,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12508,7 +12578,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8174,8 +9466,13 @@
+@@ -8173,8 +9480,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12524,7 +12594,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8199,9 +9496,10 @@
+@@ -8198,9 +9510,10 @@
ac_header_preproc=no
fi
@@ -12537,7 +12607,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8225,25 +9523,19 @@
+@@ -8224,25 +9537,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;}
@@ -12570,7 +12640,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8255,228 +9547,547 @@
+@@ -8254,234 +9561,553 @@
done
@@ -12683,7 +12753,7 @@
-
-
-# Provide some information about the compiler.
--echo "$as_me:8350:" \
+-echo "$as_me:8349:" \
- "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
@@ -12871,14 +12941,7 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ break
- fi
+-fi
-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
@@ -12890,7 +12953,21 @@
- FFLAGS="-g"
- fi
-else
+- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+- FFLAGS="-O2"
+- else
+- FFLAGS=
+- fi
+-fi
++rm -f conftest.err conftest.$ac_ext
+
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ break
++fi
++
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
+
@@ -13304,10 +13381,16 @@
+ FFLAGS="-g"
+ fi
+else
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-O2"
- else
-@@ -8496,13 +10107,13 @@
++ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++ FFLAGS="-O2"
++ else
++ FFLAGS=
++ fi
++fi
+
+ G77=`test $ac_compiler_gnu = yes && echo yes`
+ ac_ext=c
+@@ -8495,13 +10121,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -13324,7 +13407,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8531,20 +10142,70 @@
+@@ -8530,20 +10156,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -13401,7 +13484,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.
-@@ -8555,19 +10216,19 @@
+@@ -8554,19 +10230,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13427,7 +13510,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8581,9 +10242,6 @@
+@@ -8580,9 +10256,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13437,7 +13520,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'"
-@@ -8605,14 +10263,30 @@
+@@ -8604,14 +10277,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'"
;;
@@ -13470,7 +13553,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8630,14 +10304,17 @@
+@@ -8629,14 +10318,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13490,7 +13573,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8755,15 +10432,15 @@
+@@ -8754,15 +10446,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
@@ -13512,7 +13595,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8777,8 +10454,8 @@
+@@ -8776,8 +10468,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13523,7 +13606,7 @@
objdir=$lt_cv_objdir
-@@ -8799,7 +10476,7 @@
+@@ -8798,7 +10490,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13532,7 +13615,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8819,7 +10496,7 @@
+@@ -8818,7 +10510,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13541,7 +13624,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8829,8 +10506,8 @@
+@@ -8828,8 +10520,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
@@ -13552,7 +13635,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8843,32 +10520,34 @@
+@@ -8842,32 +10534,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13594,7 +13677,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8881,27 +10560,41 @@
+@@ -8880,27 +10574,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13643,7 +13726,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8909,8 +10602,8 @@
+@@ -8908,8 +10616,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
@@ -13654,7 +13737,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8923,32 +10616,34 @@
+@@ -8922,32 +10630,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13696,7 +13779,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8961,27 +10656,41 @@
+@@ -8960,27 +10670,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13745,7 +13828,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8989,8 +10698,8 @@
+@@ -8988,8 +10712,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
@@ -13756,7 +13839,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9003,32 +10712,34 @@
+@@ -9002,32 +10726,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13798,7 +13881,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9041,27 +10752,41 @@
+@@ -9040,27 +10766,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13847,7 +13930,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9076,6 +10801,7 @@
+@@ -9075,6 +10815,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -13855,7 +13938,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9095,21 +10821,32 @@
+@@ -9094,21 +10835,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -13892,7 +13975,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9129,7 +10866,7 @@
+@@ -9128,7 +10880,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13901,7 +13984,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
-@@ -9161,17 +10898,17 @@
+@@ -9160,17 +10912,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13925,7 +14008,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9191,7 +10928,7 @@
+@@ -9190,7 +10942,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -13934,7 +14017,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
-@@ -9223,11 +10960,11 @@
+@@ -9222,11 +10974,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -13950,7 +14033,7 @@
fi
else
-@@ -9242,21 +10979,21 @@
+@@ -9241,21 +10993,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -13979,7 +14062,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9286,68 +11023,25 @@
+@@ -9285,68 +11037,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14063,7 +14146,7 @@
## CAVEAT EMPTOR:
-@@ -9361,8 +11055,8 @@
+@@ -9360,8 +11069,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14074,7 +14157,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9376,26 +11070,28 @@
+@@ -9375,26 +11084,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 \
@@ -14082,13 +14165,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:9382: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11076: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9381: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11090: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9386: \$? = $ac_status" >&5
-+ echo "$as_me:11080: \$? = $ac_status" >&5
+- echo "$as_me:9385: \$? = $ac_status" >&5
++ echo "$as_me:11094: \$? = $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
@@ -14110,7 +14193,7 @@
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 +11105,8 @@
+@@ -9408,8 +11119,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14121,7 +14204,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9448,6 +11144,11 @@
+@@ -9447,6 +11158,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14133,7 +14216,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9464,7 +11165,7 @@
+@@ -9463,7 +11179,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14142,7 +14225,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9490,6 +11191,16 @@
+@@ -9489,6 +11205,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14159,7 +14242,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9501,7 +11212,7 @@
+@@ -9500,7 +11226,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.
@@ -14168,7 +14251,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9524,13 +11235,20 @@
+@@ -9523,13 +11249,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14191,7 +14274,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9545,15 +11263,15 @@
+@@ -9544,15 +11277,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14213,7 +14296,7 @@
;;
sunos4*)
-@@ -9562,7 +11280,7 @@
+@@ -9561,7 +11294,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14222,7 +14305,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9575,6 +11293,17 @@
+@@ -9574,6 +11307,17 @@
fi
;;
@@ -14240,7 +14323,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9586,16 +11315,16 @@
+@@ -9585,16 +11329,16 @@
esac
fi
@@ -14261,7 +14344,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9609,26 +11338,28 @@
+@@ -9608,26 +11352,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 \
@@ -14269,13 +14352,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:9615: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11344: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9614: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11358: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9619: \$? = $ac_status" >&5
-+ echo "$as_me:11348: \$? = $ac_status" >&5
+- echo "$as_me:9618: \$? = $ac_status" >&5
++ echo "$as_me:11362: \$? = $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
@@ -14297,7 +14380,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9641,7 +11372,7 @@
+@@ -9640,7 +11386,7 @@
fi
fi
@@ -14306,7 +14389,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9651,8 +11382,50 @@
+@@ -9650,8 +11396,50 @@
;;
esac
@@ -14359,7 +14442,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9663,60 +11436,58 @@
+@@ -9662,60 +11450,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14380,13 +14463,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:9682: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11448: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9681: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11462: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9686: \$? = $ac_status" >&5
-+ echo "$as_me:11452: \$? = $ac_status" >&5
+- echo "$as_me:9685: \$? = $ac_status" >&5
++ echo "$as_me:11466: \$? = $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
@@ -14438,7 +14521,7 @@
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 +11497,8 @@
+@@ -9725,8 +11511,8 @@
need_locks=no
fi
@@ -14449,7 +14532,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9765,6 +11536,16 @@
+@@ -9764,6 +11550,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14466,7 +14549,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9775,6 +11556,10 @@
+@@ -9774,6 +11570,10 @@
with_gnu_ld=no
fi
;;
@@ -14477,7 +14560,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9785,6 +11570,27 @@
+@@ -9784,6 +11584,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14505,7 +14588,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9822,7 +11628,7 @@
+@@ -9821,7 +11642,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14514,7 +14597,7 @@
else
ld_shlibs=no
fi
-@@ -9832,13 +11638,13 @@
+@@ -9831,13 +11652,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'
@@ -14531,7 +14614,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
-@@ -9847,23 +11653,70 @@
+@@ -9846,23 +11667,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14607,7 +14690,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9877,13 +11730,40 @@
+@@ -9876,13 +11744,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14650,7 +14733,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9893,24 +11773,19 @@
+@@ -9892,24 +11787,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14682,7 +14765,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9922,7 +11797,7 @@
+@@ -9921,7 +11811,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14691,7 +14774,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9944,9 +11819,21 @@
+@@ -9943,9 +11833,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
@@ -14715,7 +14798,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9963,7 +11850,7 @@
+@@ -9962,7 +11864,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -14724,20 +14807,21 @@
# 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`
-@@ -9982,8 +11869,12 @@
+@@ -9981,31 +11883,36 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
+ ;;
esac
shared_flag='-shared'
+- else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
- else
++ else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9991,22 +11882,23 @@
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -14768,7 +14852,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10022,24 +11914,36 @@
+@@ -10021,24 +11928,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14813,7 +14897,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10053,19 +11957,20 @@
+@@ -10052,19 +11971,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14821,7 +14905,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14839,7 +14923,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10084,24 +11989,36 @@
+@@ -10083,24 +12003,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14884,7 +14968,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10115,8 +12032,10 @@
+@@ -10114,8 +12046,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14892,11 +14976,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10125,13 +12044,11 @@
+@@ -10124,13 +12058,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -14913,7 +14997,7 @@
fi
fi
;;
-@@ -10144,7 +12061,7 @@
+@@ -10143,7 +12075,7 @@
ld_shlibs=no
;;
@@ -14922,7 +15006,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10154,13 +12071,13 @@
+@@ -10153,13 +12085,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -14939,7 +15023,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.
-@@ -10170,52 +12087,52 @@
+@@ -10169,52 +12101,52 @@
;;
darwin* | rhapsody*)
@@ -15032,7 +15116,7 @@
fi
;;
-@@ -10249,8 +12166,8 @@
+@@ -10248,8 +12180,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15043,7 +15127,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10258,7 +12175,7 @@
+@@ -10257,7 +12189,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15052,7 +15136,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
-@@ -10272,47 +12189,62 @@
+@@ -10271,47 +12203,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15139,7 +15223,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10326,7 +12258,7 @@
+@@ -10325,7 +12272,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15148,7 +15232,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'
-@@ -10336,7 +12268,7 @@
+@@ -10335,7 +12282,7 @@
link_all_deplibs=yes
;;
@@ -15157,7 +15241,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10359,7 +12291,8 @@
+@@ -10358,7 +12305,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
@@ -15167,7 +15251,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10369,7 +12302,7 @@
+@@ -10368,7 +12316,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15176,7 +15260,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10380,14 +12313,14 @@
+@@ -10379,14 +12327,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15193,7 +15277,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'
-@@ -10399,13 +12332,13 @@
+@@ -10398,13 +12346,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15209,7 +15293,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10413,21 +12346,15 @@
+@@ -10412,21 +12360,15 @@
hardcode_libdir_separator=:
;;
@@ -15235,7 +15319,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'
-@@ -10436,8 +12363,18 @@
+@@ -10435,8 +12377,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15256,7 +15340,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10446,7 +12383,7 @@
+@@ -10445,7 +12397,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.
@@ -15265,7 +15349,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10494,36 +12431,45 @@
+@@ -10493,36 +12445,45 @@
fi
;;
@@ -15332,7 +15416,7 @@
;;
uts4*)
-@@ -10538,15 +12484,10 @@
+@@ -10537,15 +12498,10 @@
esac
fi
@@ -15350,7 +15434,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10564,8 +12505,8 @@
+@@ -10563,8 +12519,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.
@@ -15361,7 +15445,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10579,6 +12520,7 @@
+@@ -10578,6 +12534,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15369,7 +15453,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10601,20 +12543,20 @@
+@@ -10600,20 +12557,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15395,7 +15479,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10624,7 +12566,20 @@
+@@ -10623,7 +12580,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15417,7 +15501,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10689,7 +12644,7 @@
+@@ -10688,7 +12658,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15426,7 +15510,7 @@
;;
beos*)
-@@ -10698,7 +12653,7 @@
+@@ -10697,7 +12667,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15435,7 +15519,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10714,7 +12669,7 @@
+@@ -10713,7 +12683,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15444,7 +15528,7 @@
need_version=no
need_lib_prefix=no
-@@ -10726,7 +12681,8 @@
+@@ -10725,7 +12695,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15454,7 +15538,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10756,7 +12712,7 @@
+@@ -10755,7 +12726,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15463,7 +15547,7 @@
;;
esac
;;
-@@ -10779,7 +12735,7 @@
+@@ -10778,7 +12749,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15472,7 +15556,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"`
-@@ -10802,20 +12758,17 @@
+@@ -10801,20 +12772,17 @@
dynamic_linker=no
;;
@@ -15504,7 +15588,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10833,14 +12786,19 @@
+@@ -10832,14 +12800,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15526,7 +15610,7 @@
esac
;;
-@@ -10860,9 +12818,9 @@
+@@ -10859,9 +12832,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15538,7 +15622,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10877,7 +12835,7 @@
+@@ -10876,7 +12849,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15547,7 +15631,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10888,7 +12846,7 @@
+@@ -10887,7 +12860,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15556,7 +15640,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10900,6 +12858,18 @@
+@@ -10899,6 +12872,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15575,7 +15659,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10943,29 +12913,26 @@
+@@ -10942,29 +12927,26 @@
;;
# This must be Linux ELF.
@@ -15612,7 +15696,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,
-@@ -10975,6 +12942,18 @@
+@@ -10974,6 +12956,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15631,7 +15715,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10984,7 +12963,7 @@
+@@ -10983,7 +12977,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15640,7 +15724,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11012,8 +12991,13 @@
+@@ -11011,8 +13005,13 @@
openbsd*)
version_type=sunos
@@ -15655,7 +15739,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
-@@ -11033,7 +13017,7 @@
+@@ -11032,7 +13031,7 @@
os2*)
libname_spec='$name'
@@ -15664,7 +15748,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11051,13 +13035,6 @@
+@@ -11050,13 +13049,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15678,7 +15762,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11083,7 +13060,7 @@
+@@ -11082,7 +13074,7 @@
need_version=yes
;;
@@ -15687,7 +15771,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'
-@@ -11116,6 +13093,29 @@
+@@ -11115,6 +13107,29 @@
fi
;;
@@ -15717,7 +15801,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11127,16 +13127,21 @@
+@@ -11126,16 +13141,21 @@
dynamic_linker=no
;;
esac
@@ -15745,7 +15829,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11156,8 +13161,8 @@
+@@ -11155,8 +13175,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -15756,7 +15840,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11170,29 +13175,29 @@
+@@ -11169,29 +13189,29 @@
striplib=
old_striplib=
@@ -15796,7 +15880,7 @@
;;
esac
fi
-@@ -11224,8 +13229,8 @@
+@@ -11223,8 +13243,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -15807,7 +15891,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11238,40 +13243,52 @@
+@@ -11237,40 +13257,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15872,7 +15956,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11280,14 +13297,15 @@
+@@ -11279,14 +13311,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15881,7 +15965,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15892,7 +15976,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11301,8 +13319,8 @@
+@@ -11300,8 +13333,8 @@
;;
*)
@@ -15903,7 +15987,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11329,53 +13347,59 @@
+@@ -11328,53 +13361,59 @@
#undef shl_load
@@ -15982,7 +16066,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11384,18 +13408,19 @@
+@@ -11383,18 +13422,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15991,7 +16075,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -16008,7 +16092,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11408,40 +13433,52 @@
+@@ -11407,40 +13447,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16073,7 +16157,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11450,19 +13487,20 @@
+@@ -11449,19 +13501,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16082,7 +16166,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16100,7 +16184,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11489,53 +13527,59 @@
+@@ -11488,53 +13541,59 @@
#undef dlopen
@@ -16179,7 +16263,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11544,18 +13588,19 @@
+@@ -11543,18 +13602,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16188,7 +16272,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16205,7 +16289,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11568,40 +13613,52 @@
+@@ -11567,40 +13627,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16270,7 +16354,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11610,19 +13667,20 @@
+@@ -11609,19 +13681,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16279,7 +16363,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16297,7 +16381,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11635,40 +13693,52 @@
+@@ -11634,40 +13707,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16362,7 +16446,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11677,19 +13747,20 @@
+@@ -11676,19 +13761,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16371,7 +16455,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16389,7 +16473,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11702,40 +13773,52 @@
+@@ -11701,40 +13787,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16454,7 +16538,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11744,14 +13827,15 @@
+@@ -11743,14 +13841,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16463,7 +16547,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16474,7 +16558,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11786,13 +13870,13 @@
+@@ -11785,13 +13884,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16491,16 +16575,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11802,7 +13886,7 @@
+@@ -11801,7 +13900,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11805 "configure"
-+#line 13889 "configure"
+-#line 11804 "configure"
++#line 13903 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11859,6 +13943,8 @@
+@@ -11858,6 +13957,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16509,7 +16593,7 @@
exit (status);
}
-@@ -11868,12 +13954,12 @@
+@@ -11867,12 +13968,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16524,7 +16608,7 @@
esac
else :
# compilation failed
-@@ -11884,13 +13970,13 @@
+@@ -11883,13 +13984,13 @@
fi
@@ -16543,16 +16627,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11900,7 +13986,7 @@
+@@ -11899,7 +14000,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11903 "configure"
-+#line 13989 "configure"
+-#line 11902 "configure"
++#line 14003 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11957,6 +14043,8 @@
+@@ -11956,6 +14057,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16561,7 +16645,7 @@
exit (status);
}
-@@ -11966,12 +14054,12 @@
+@@ -11965,12 +14068,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16576,7 +16660,7 @@
esac
else :
# compilation failed
-@@ -11982,8 +14070,8 @@
+@@ -11981,8 +14084,8 @@
fi
@@ -16587,7 +16671,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12004,19 +14092,19 @@
+@@ -12003,19 +14106,19 @@
fi
@@ -16615,7 +16699,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12025,58 +14113,21 @@
+@@ -12024,58 +14127,21 @@
fi
;;
@@ -16681,7 +16765,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12091,7 +14142,8 @@
+@@ -12090,7 +14156,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.
@@ -16691,7 +16775,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 \
-@@ -12205,11 +14257,11 @@
+@@ -12204,11 +14271,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16705,7 +16789,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12239,6 +14291,12 @@
+@@ -12238,6 +14305,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -16718,7 +16802,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12250,6 +14308,9 @@
+@@ -12249,6 +14322,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -16728,7 +16812,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12269,7 +14330,7 @@
+@@ -12268,7 +14344,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -16737,7 +16821,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12300,7 +14361,7 @@
+@@ -12299,7 +14375,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -16746,7 +16830,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12315,7 +14376,7 @@
+@@ -12314,7 +14390,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -16755,7 +16839,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12542,7 +14603,10 @@
+@@ -12541,7 +14617,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.
@@ -16767,7 +16851,7 @@
fi
-@@ -12555,11 +14619,11 @@
+@@ -12554,11 +14633,11 @@
CC="$lt_save_CC"
@@ -16783,7 +16867,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12577,6 +14641,9 @@
+@@ -12576,6 +14655,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -16793,7 +16877,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12607,8 +14674,10 @@
+@@ -12606,8 +14688,10 @@
case $tagname in
CXX)
@@ -16806,7 +16890,7 @@
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'
-@@ -12627,6 +14696,7 @@
+@@ -12626,6 +14710,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -16814,7 +16898,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12644,7 +14714,7 @@
+@@ -12643,7 +14728,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -16823,7 +16907,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12654,17 +14724,34 @@
+@@ -12653,17 +14738,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -16859,7 +16943,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12675,18 +14762,27 @@
+@@ -12674,18 +14776,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -16890,7 +16974,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12700,18 +14796,18 @@
+@@ -12699,18 +14810,18 @@
# Set up default GNU C++ configuration
@@ -16915,7 +16999,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12740,11 +14836,11 @@
+@@ -12739,11 +14850,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -16931,7 +17015,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12757,7 +14853,7 @@
+@@ -12756,7 +14867,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,
@@ -16940,7 +17024,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'*)
-@@ -12777,21 +14873,21 @@
+@@ -12776,21 +14887,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -16969,7 +17053,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12801,8 +14897,8 @@
+@@ -12800,8 +14911,8 @@
;;
esac
fi
@@ -16980,7 +17064,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12810,8 +14906,8 @@
+@@ -12809,8 +14920,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
@@ -16991,7 +17075,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12837,7 +14933,7 @@
+@@ -12836,7 +14947,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.
@@ -17000,7 +17084,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12852,8 +14948,8 @@
+@@ -12851,8 +14962,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17011,7 +17095,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12868,8 +14964,23 @@
+@@ -12867,8 +14978,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17037,7 +17121,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12886,7 +14997,7 @@
+@@ -12885,7 +15011,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17046,7 +17130,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`
-@@ -12905,8 +15016,12 @@
+@@ -12904,8 +15030,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17059,7 +17143,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12915,15 +15030,16 @@
+@@ -12914,15 +15044,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17080,7 +17164,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.
-@@ -12945,24 +15061,36 @@
+@@ -12944,24 +15075,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17125,7 +17209,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12976,20 +15104,21 @@
+@@ -12975,20 +15118,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17133,7 +17217,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17151,7 +17235,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13008,24 +15137,36 @@
+@@ -13007,24 +15151,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17196,7 +17280,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13039,8 +15180,10 @@
+@@ -13038,8 +15194,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17204,11 +17288,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13049,16 +15192,26 @@
+@@ -13048,16 +15206,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17240,7 +17324,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13072,12 +15225,12 @@
+@@ -13071,12 +15239,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'
@@ -17255,7 +17339,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
-@@ -13086,70 +15239,81 @@
+@@ -13085,70 +15253,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17389,7 +17473,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13160,14 +15324,14 @@
+@@ -13159,14 +15338,14 @@
;;
esac
;;
@@ -17406,7 +17490,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13184,12 +15348,12 @@
+@@ -13183,12 +15362,12 @@
# location of the library.
case $cc_basename in
@@ -17422,7 +17506,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13198,11 +15362,11 @@
+@@ -13197,11 +15376,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.
@@ -17436,7 +17520,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13212,33 +15376,22 @@
+@@ -13211,33 +15390,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17477,7 +17561,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13249,17 +15402,20 @@
+@@ -13248,17 +15416,20 @@
esac
case $cc_basename in
@@ -17504,7 +17588,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13275,12 +15431,15 @@
+@@ -13274,12 +15445,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17524,7 +17608,7 @@
;;
esac
fi
-@@ -13291,11 +15450,25 @@
+@@ -13290,11 +15464,25 @@
;;
esac
;;
@@ -17552,7 +17636,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13306,9 +15479,9 @@
+@@ -13305,9 +15493,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17564,7 +17648,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13317,16 +15490,16 @@
+@@ -13316,16 +15504,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17585,7 +17669,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13344,20 +15517,44 @@
+@@ -13343,20 +15531,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17636,7 +17720,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13385,7 +15582,7 @@
+@@ -13384,7 +15596,7 @@
;;
mvs*)
case $cc_basename in
@@ -17645,7 +17729,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13395,7 +15592,7 @@
+@@ -13394,7 +15606,7 @@
;;
esac
;;
@@ -17654,7 +17738,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=
-@@ -13406,15 +15603,31 @@
+@@ -13405,15 +15617,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::"'
;;
@@ -17688,7 +17772,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13424,14 +15637,14 @@
+@@ -13423,14 +15651,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17706,7 +17790,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13449,7 +15662,7 @@
+@@ -13448,7 +15676,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17715,7 +17799,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13468,13 +15681,13 @@
+@@ -13467,13 +15695,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -17731,7 +17815,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13483,17 +15696,17 @@
+@@ -13482,17 +15710,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -17753,7 +17837,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13512,7 +15725,7 @@
+@@ -13511,7 +15739,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17762,7 +17846,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13533,27 +15746,14 @@
+@@ -13532,27 +15760,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -17792,7 +17876,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13566,36 +15766,33 @@
+@@ -13565,36 +15780,33 @@
;;
solaris*)
case $cc_basename in
@@ -17841,7 +17925,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13603,9 +15800,9 @@
+@@ -13602,9 +15814,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -17853,7 +17937,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13615,9 +15812,9 @@
+@@ -13614,9 +15826,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
@@ -17865,7 +17949,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13626,9 +15823,9 @@
+@@ -13625,9 +15837,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -17877,7 +17961,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13641,12 +15838,63 @@
+@@ -13640,12 +15852,63 @@
;;
esac
;;
@@ -17943,7 +18027,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13666,8 +15914,8 @@
+@@ -13665,8 +15928,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -17954,7 +18038,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13703,7 +15951,7 @@
+@@ -13702,7 +15965,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.
@@ -17963,7 +18047,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13743,7 +15991,7 @@
+@@ -13742,7 +16005,7 @@
fi
;;
@@ -17972,7 +18056,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13779,6 +16027,29 @@
+@@ -13778,6 +16041,29 @@
$rm -f confest.$objext
@@ -18002,7 +18086,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13787,8 +16058,8 @@
+@@ -13786,8 +16072,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18013,7 +18097,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13826,6 +16097,10 @@
+@@ -13825,6 +16111,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18024,7 +18108,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13834,7 +16109,7 @@
+@@ -13833,7 +16123,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18033,7 +18117,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13859,18 +16134,28 @@
+@@ -13858,18 +16148,28 @@
;;
chorus*)
case $cc_basename in
@@ -18065,7 +18149,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13878,22 +16163,22 @@
+@@ -13877,22 +16177,22 @@
;;
esac
;;
@@ -18094,7 +18178,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13906,9 +16191,13 @@
+@@ -13905,9 +16205,13 @@
;;
esac
;;
@@ -18109,7 +18193,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13917,20 +16206,26 @@
+@@ -13916,20 +16220,26 @@
;;
esac
;;
@@ -18140,7 +18224,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13947,25 +16242,25 @@
+@@ -13946,25 +16256,25 @@
;;
mvs*)
case $cc_basename in
@@ -18171,7 +18255,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13979,24 +16274,15 @@
+@@ -13978,24 +16288,15 @@
;;
psos*)
;;
@@ -18198,7 +18282,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14006,12 +16292,12 @@
+@@ -14005,12 +16306,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18213,7 +18297,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14021,7 +16307,7 @@
+@@ -14020,7 +16321,7 @@
;;
tandem*)
case $cc_basename in
@@ -18222,7 +18306,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14029,7 +16315,14 @@
+@@ -14028,7 +16329,14 @@
;;
esac
;;
@@ -18238,7 +18322,7 @@
;;
vxworks*)
;;
-@@ -14039,16 +16332,16 @@
+@@ -14038,16 +16346,16 @@
esac
fi
@@ -18259,7 +18343,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14062,26 +16355,28 @@
+@@ -14061,26 +16369,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 \
@@ -18267,13 +18351,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:14068: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16361: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14067: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16375: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14072: \$? = $ac_status" >&5
-+ echo "$as_me:16365: \$? = $ac_status" >&5
+- echo "$as_me:14071: \$? = $ac_status" >&5
++ echo "$as_me:16379: \$? = $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
@@ -18295,7 +18379,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14094,7 +16389,7 @@
+@@ -14093,7 +16403,7 @@
fi
fi
@@ -18304,7 +18388,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14104,8 +16399,50 @@
+@@ -14103,8 +16413,50 @@
;;
esac
@@ -18357,7 +18441,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14116,60 +16453,58 @@
+@@ -14115,60 +16467,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18378,13 +18462,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:14135: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16465: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14134: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16479: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14139: \$? = $ac_status" >&5
-+ echo "$as_me:16469: \$? = $ac_status" >&5
+- echo "$as_me:14138: \$? = $ac_status" >&5
++ echo "$as_me:16483: \$? = $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
@@ -18436,7 +18520,7 @@
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 +16514,8 @@
+@@ -14178,8 +16528,8 @@
need_locks=no
fi
@@ -18447,7 +18531,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14197,22 +16532,20 @@
+@@ -14196,22 +16546,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18476,7 +18560,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14230,8 +16563,8 @@
+@@ -14229,8 +16577,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.
@@ -18487,7 +18571,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14245,6 +16578,7 @@
+@@ -14244,6 +16592,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18495,7 +18579,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14267,20 +16601,20 @@
+@@ -14266,20 +16615,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18521,7 +18605,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14290,7 +16624,20 @@
+@@ -14289,7 +16638,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18543,7 +18627,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14355,7 +16702,7 @@
+@@ -14354,7 +16716,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18552,7 +18636,7 @@
;;
beos*)
-@@ -14364,7 +16711,7 @@
+@@ -14363,7 +16725,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18561,7 +18645,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14380,7 +16727,7 @@
+@@ -14379,7 +16741,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18570,7 +18654,7 @@
need_version=no
need_lib_prefix=no
-@@ -14392,7 +16739,8 @@
+@@ -14391,7 +16753,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18580,7 +18664,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14422,7 +16770,7 @@
+@@ -14421,7 +16784,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18589,7 +18673,7 @@
;;
esac
;;
-@@ -14445,7 +16793,7 @@
+@@ -14444,7 +16807,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18598,7 +18682,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"`
-@@ -14468,20 +16816,17 @@
+@@ -14467,20 +16830,17 @@
dynamic_linker=no
;;
@@ -18630,7 +18714,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14499,14 +16844,19 @@
+@@ -14498,14 +16858,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18652,7 +18736,7 @@
esac
;;
-@@ -14526,9 +16876,9 @@
+@@ -14525,9 +16890,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18664,7 +18748,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14543,7 +16893,7 @@
+@@ -14542,7 +16907,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18673,7 +18757,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14554,7 +16904,7 @@
+@@ -14553,7 +16918,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18682,7 +18766,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14566,6 +16916,18 @@
+@@ -14565,6 +16930,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18701,7 +18785,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14609,29 +16971,26 @@
+@@ -14608,29 +16985,26 @@
;;
# This must be Linux ELF.
@@ -18738,7 +18822,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,
-@@ -14641,6 +17000,18 @@
+@@ -14640,6 +17014,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18757,7 +18841,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14650,7 +17021,7 @@
+@@ -14649,7 +17035,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -18766,7 +18850,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14678,8 +17049,13 @@
+@@ -14677,8 +17063,13 @@
openbsd*)
version_type=sunos
@@ -18781,7 +18865,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
-@@ -14699,7 +17075,7 @@
+@@ -14698,7 +17089,7 @@
os2*)
libname_spec='$name'
@@ -18790,7 +18874,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14717,13 +17093,6 @@
+@@ -14716,13 +17107,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18804,7 +18888,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14749,7 +17118,7 @@
+@@ -14748,7 +17132,7 @@
need_version=yes
;;
@@ -18813,23 +18897,17 @@
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'
-@@ -14782,27 +17151,55 @@
+@@ -14781,6 +17165,29 @@
fi
;;
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -18846,14 +18924,10 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14792,16 +17199,21 @@
dynamic_linker=no
;;
esac
@@ -18881,7 +18955,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14822,8 +17219,8 @@
+@@ -14821,8 +17233,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -18892,7 +18966,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14834,1001 +17231,176 @@
+@@ -14833,1001 +17245,176 @@
enable_fast_install=needless
fi
@@ -19669,7 +19743,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15471 "configure"
+-#line 15470 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -19767,7 +19841,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15569 "configure"
+-#line 15568 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -20035,7 +20109,7 @@
# How to create reloadable object files.
reload_flag=$lt_reload_flag
-@@ -15844,7 +17416,7 @@
+@@ -15843,7 +17430,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -20044,7 +20118,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15859,7 +17431,7 @@
+@@ -15858,7 +17445,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -20053,7 +20127,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -16061,7 +17633,10 @@
+@@ -16060,7 +17647,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.
@@ -20065,7 +20139,7 @@
fi
-@@ -16133,29 +17708,55 @@
+@@ -16132,29 +17722,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20105,19 +20179,19 @@
+ 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
++
+{ 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
@@ -20129,7 +20203,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16163,21 +17764,21 @@
+@@ -16162,21 +17778,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20161,7 +20235,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16186,8 +17787,8 @@
+@@ -16185,8 +17801,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20172,7 +20246,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16225,6 +17826,11 @@
+@@ -16224,6 +17840,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20184,7 +20258,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16241,7 +17847,7 @@
+@@ -16240,7 +17861,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20193,7 +20267,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16267,6 +17873,16 @@
+@@ -16266,6 +17887,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20210,7 +20284,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16278,7 +17894,7 @@
+@@ -16277,7 +17908,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.
@@ -20219,7 +20293,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16301,13 +17917,20 @@
+@@ -16300,13 +17931,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20242,7 +20316,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16322,15 +17945,15 @@
+@@ -16321,15 +17959,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20264,7 +20338,7 @@
;;
sunos4*)
-@@ -16339,7 +17962,7 @@
+@@ -16338,7 +17976,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20273,7 +20347,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16352,6 +17975,17 @@
+@@ -16351,6 +17989,17 @@
fi
;;
@@ -20291,7 +20365,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16363,16 +17997,16 @@
+@@ -16362,16 +18011,16 @@
esac
fi
@@ -20312,7 +20386,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16386,26 +18020,28 @@
+@@ -16385,26 +18034,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 \
@@ -20320,13 +20394,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:16392: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18026: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16391: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18040: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16396: \$? = $ac_status" >&5
-+ echo "$as_me:18030: \$? = $ac_status" >&5
+- echo "$as_me:16395: \$? = $ac_status" >&5
++ echo "$as_me:18044: \$? = $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
@@ -20348,7 +20422,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16418,7 +18054,7 @@
+@@ -16417,7 +18068,7 @@
fi
fi
@@ -20357,7 +20431,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16428,24 +18064,59 @@
+@@ -16427,72 +18078,112 @@
;;
esac
@@ -20375,10 +20449,6 @@
else
- lt_cv_prog_compiler_c_o_F77=no
- $rm -r conftest 2>/dev/null
-- mkdir conftest
-- cd conftest
-- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -20404,13 +20474,7 @@
+fi
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-
-- # 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 .
++
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+ :
+else
@@ -20425,14 +20489,21 @@
+else
+ lt_cv_prog_compiler_c_o_F77=no
+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 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
-@@ -16453,47 +18124,52 @@
+ # (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 \
@@ -20440,13 +20511,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:16459: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18130: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16458: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18144: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16463: \$? = $ac_status" >&5
-+ echo "$as_me:18134: \$? = $ac_status" >&5
+- echo "$as_me:16462: \$? = $ac_status" >&5
++ echo "$as_me:18148: \$? = $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
@@ -20498,7 +20569,7 @@
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 +18179,8 @@
+@@ -16502,8 +18193,8 @@
need_locks=no
fi
@@ -20509,7 +20580,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16542,6 +18218,16 @@
+@@ -16541,6 +18232,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20526,7 +20597,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16552,6 +18238,10 @@
+@@ -16551,6 +18252,10 @@
with_gnu_ld=no
fi
;;
@@ -20537,7 +20608,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16562,6 +18252,27 @@
+@@ -16561,6 +18266,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20565,7 +20636,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16599,7 +18310,7 @@
+@@ -16598,7 +18324,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20574,7 +20645,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16609,13 +18320,13 @@
+@@ -16608,13 +18334,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'
@@ -20591,7 +20662,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
-@@ -16624,23 +18335,70 @@
+@@ -16623,23 +18349,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20668,7 +20739,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16654,13 +18412,40 @@
+@@ -16653,13 +18426,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20711,7 +20782,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16670,24 +18455,19 @@
+@@ -16669,24 +18469,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20743,7 +20814,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16699,7 +18479,7 @@
+@@ -16698,7 +18493,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -20752,7 +20823,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16721,9 +18501,21 @@
+@@ -16720,9 +18515,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
@@ -20776,7 +20847,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16740,7 +18532,7 @@
+@@ -16739,7 +18546,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -20785,7 +20856,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`
-@@ -16759,8 +18551,12 @@
+@@ -16758,8 +18565,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -20798,7 +20869,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16768,45 +18564,58 @@
+@@ -16767,45 +18578,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -20872,7 +20943,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16820,19 +18629,20 @@
+@@ -16819,19 +18643,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20880,7 +20951,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -20898,7 +20969,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16841,24 +18651,36 @@
+@@ -16840,24 +18665,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -20943,7 +21014,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16872,8 +18694,10 @@
+@@ -16871,8 +18708,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20951,11 +21022,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16882,13 +18706,11 @@
+@@ -16881,13 +18720,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -20972,7 +21043,7 @@
fi
fi
;;
-@@ -16901,7 +18723,7 @@
+@@ -16900,7 +18737,7 @@
ld_shlibs_F77=no
;;
@@ -20981,7 +21052,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16911,68 +18733,68 @@
+@@ -16910,68 +18747,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21094,7 +21165,7 @@
fi
;;
-@@ -17006,8 +18828,8 @@
+@@ -17005,8 +18842,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21105,7 +21176,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17015,7 +18837,7 @@
+@@ -17014,7 +18851,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21114,7 +21185,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
-@@ -17029,47 +18851,62 @@
+@@ -17028,47 +18865,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21201,7 +21272,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17083,7 +18920,7 @@
+@@ -17082,7 +18934,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21210,7 +21281,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'
-@@ -17093,7 +18930,7 @@
+@@ -17092,7 +18944,7 @@
link_all_deplibs_F77=yes
;;
@@ -21219,7 +21290,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
-@@ -17116,7 +18953,8 @@
+@@ -17115,7 +18967,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
@@ -21229,7 +21300,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17126,7 +18964,7 @@
+@@ -17125,7 +18978,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21238,7 +21309,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17137,14 +18975,14 @@
+@@ -17136,14 +18989,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21255,7 +21326,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'
-@@ -17156,13 +18994,13 @@
+@@ -17155,13 +19008,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21271,7 +21342,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17170,21 +19008,15 @@
+@@ -17169,21 +19022,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21297,7 +21368,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'
-@@ -17193,8 +19025,18 @@
+@@ -17192,8 +19039,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21318,7 +21389,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17203,7 +19045,7 @@
+@@ -17202,7 +19059,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.
@@ -21327,7 +21398,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17251,36 +19093,45 @@
+@@ -17250,36 +19107,45 @@
fi
;;
@@ -21394,7 +21465,7 @@
;;
uts4*)
-@@ -17295,15 +19146,10 @@
+@@ -17294,15 +19160,10 @@
esac
fi
@@ -21412,7 +21483,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17321,8 +19167,8 @@
+@@ -17320,8 +19181,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.
@@ -21423,7 +21494,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17336,6 +19182,7 @@
+@@ -17335,6 +19196,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21431,7 +21502,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17358,20 +19205,20 @@
+@@ -17357,20 +19219,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21457,7 +21528,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17381,7 +19228,20 @@
+@@ -17380,7 +19242,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21479,7 +21550,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17446,7 +19306,7 @@
+@@ -17445,7 +19320,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21488,7 +21559,7 @@
;;
beos*)
-@@ -17455,7 +19315,7 @@
+@@ -17454,7 +19329,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21497,7 +21568,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17471,7 +19331,7 @@
+@@ -17470,7 +19345,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21506,7 +21577,7 @@
need_version=no
need_lib_prefix=no
-@@ -17483,7 +19343,8 @@
+@@ -17482,7 +19357,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21516,7 +21587,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17513,7 +19374,7 @@
+@@ -17512,7 +19388,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21525,7 +21596,7 @@
;;
esac
;;
-@@ -17536,7 +19397,7 @@
+@@ -17535,7 +19411,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21534,7 +21605,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"`
-@@ -17559,20 +19420,17 @@
+@@ -17558,20 +19434,17 @@
dynamic_linker=no
;;
@@ -21566,7 +21637,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17590,14 +19448,19 @@
+@@ -17589,14 +19462,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21588,7 +21659,7 @@
esac
;;
-@@ -17617,9 +19480,9 @@
+@@ -17616,9 +19494,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21600,7 +21671,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17634,7 +19497,7 @@
+@@ -17633,7 +19511,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21609,7 +21680,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17645,7 +19508,7 @@
+@@ -17644,7 +19522,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21618,7 +21689,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17657,6 +19520,18 @@
+@@ -17656,6 +19534,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21637,7 +21708,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17700,29 +19575,26 @@
+@@ -17699,29 +19589,26 @@
;;
# This must be Linux ELF.
@@ -21674,7 +21745,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,
-@@ -17732,6 +19604,18 @@
+@@ -17731,6 +19618,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21693,7 +21764,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17741,7 +19625,7 @@
+@@ -17740,7 +19639,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21702,7 +21773,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17769,8 +19653,13 @@
+@@ -17768,8 +19667,13 @@
openbsd*)
version_type=sunos
@@ -21717,7 +21788,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
-@@ -17790,7 +19679,7 @@
+@@ -17789,7 +19693,7 @@
os2*)
libname_spec='$name'
@@ -21726,7 +21797,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17808,13 +19697,6 @@
+@@ -17807,13 +19711,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -21740,7 +21811,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17840,7 +19722,7 @@
+@@ -17839,7 +19736,7 @@
need_version=yes
;;
@@ -21749,7 +21820,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'
-@@ -17873,6 +19755,29 @@
+@@ -17872,6 +19769,29 @@
fi
;;
@@ -21779,7 +21850,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17884,16 +19789,21 @@
+@@ -17883,16 +19803,21 @@
dynamic_linker=no
;;
esac
@@ -21807,7 +21878,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17913,8 +19823,8 @@
+@@ -17912,8 +19837,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -21818,7 +21889,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17925,36 +19835,6 @@
+@@ -17924,36 +19849,6 @@
enable_fast_install=needless
fi
@@ -21855,7 +21926,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17969,7 +19849,8 @@
+@@ -17968,7 +19863,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.
@@ -21865,7 +21936,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 \
-@@ -18069,6 +19950,12 @@
+@@ -18068,6 +19964,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -21878,7 +21949,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18080,6 +19967,9 @@
+@@ -18079,6 +19981,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -21888,7 +21959,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18099,7 +19989,7 @@
+@@ -18098,7 +20003,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -21897,7 +21968,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18130,7 +20020,7 @@
+@@ -18129,7 +20034,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -21906,7 +21977,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18145,7 +20035,7 @@
+@@ -18144,7 +20049,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -21915,7 +21986,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18347,7 +20237,10 @@
+@@ -18346,7 +20251,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.
@@ -21927,7 +21998,7 @@
fi
-@@ -18368,7 +20261,6 @@
+@@ -18367,7 +20275,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -21935,7 +22006,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18380,26 +20272,55 @@
+@@ -18379,26 +20286,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -21992,7 +22063,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
-@@ -18411,8 +20332,8 @@
+@@ -18410,8 +20346,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22003,7 +22074,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18426,26 +20347,28 @@
+@@ -18425,26 +20361,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 \
@@ -22011,13 +22082,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:18432: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20353: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18431: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20367: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18436: \$? = $ac_status" >&5
-+ echo "$as_me:20357: \$? = $ac_status" >&5
+- echo "$as_me:18435: \$? = $ac_status" >&5
++ echo "$as_me:20371: \$? = $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
@@ -22039,7 +22110,7 @@
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 +20382,8 @@
+@@ -18458,8 +20396,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22050,7 +22121,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18498,6 +20421,11 @@
+@@ -18497,6 +20435,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22062,7 +22133,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18514,7 +20442,7 @@
+@@ -18513,7 +20456,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22071,7 +22142,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18540,6 +20468,16 @@
+@@ -18539,6 +20482,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22088,7 +22159,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18551,7 +20489,7 @@
+@@ -18550,7 +20503,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.
@@ -22097,7 +22168,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18574,13 +20512,20 @@
+@@ -18573,13 +20526,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22120,7 +22191,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18595,15 +20540,15 @@
+@@ -18594,15 +20554,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22142,7 +22213,7 @@
;;
sunos4*)
-@@ -18612,7 +20557,7 @@
+@@ -18611,7 +20571,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22151,7 +22222,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18625,6 +20570,17 @@
+@@ -18624,6 +20584,17 @@
fi
;;
@@ -22169,7 +22240,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18636,16 +20592,16 @@
+@@ -18635,16 +20606,16 @@
esac
fi
@@ -22190,7 +22261,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18659,26 +20615,28 @@
+@@ -18658,26 +20629,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 \
@@ -22198,13 +22269,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:18665: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20621: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18664: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20635: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18669: \$? = $ac_status" >&5
-+ echo "$as_me:20625: \$? = $ac_status" >&5
+- echo "$as_me:18668: \$? = $ac_status" >&5
++ echo "$as_me:20639: \$? = $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
@@ -22226,7 +22297,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18691,7 +20649,7 @@
+@@ -18690,7 +20663,7 @@
fi
fi
@@ -22235,7 +22306,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18701,8 +20659,50 @@
+@@ -18700,8 +20673,50 @@
;;
esac
@@ -22288,7 +22359,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18713,60 +20713,58 @@
+@@ -18712,60 +20727,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22309,13 +22380,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:18732: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20725: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18731: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20739: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18736: \$? = $ac_status" >&5
-+ echo "$as_me:20729: \$? = $ac_status" >&5
+- echo "$as_me:18735: \$? = $ac_status" >&5
++ echo "$as_me:20743: \$? = $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
@@ -22367,7 +22438,7 @@
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 +20774,8 @@
+@@ -18775,8 +20788,8 @@
need_locks=no
fi
@@ -22378,7 +22449,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18815,6 +20813,16 @@
+@@ -18814,6 +20827,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22395,7 +22466,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18825,6 +20833,10 @@
+@@ -18824,6 +20847,10 @@
with_gnu_ld=no
fi
;;
@@ -22406,7 +22477,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18835,6 +20847,27 @@
+@@ -18834,6 +20861,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22434,7 +22505,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18872,7 +20905,7 @@
+@@ -18871,7 +20919,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22443,7 +22514,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18882,13 +20915,13 @@
+@@ -18881,13 +20929,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'
@@ -22460,7 +22531,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
-@@ -18897,23 +20930,70 @@
+@@ -18896,23 +20944,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22469,10 +22540,9 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ interix3*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
@@ -22517,9 +22587,10 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -22537,7 +22608,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18927,13 +21007,40 @@
+@@ -18926,13 +21021,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22580,7 +22651,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18943,24 +21050,19 @@
+@@ -18942,24 +21064,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22612,7 +22683,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18972,7 +21074,7 @@
+@@ -18971,7 +21088,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22621,7 +22692,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18994,9 +21096,21 @@
+@@ -18993,9 +21110,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
@@ -22645,7 +22716,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19013,7 +21127,7 @@
+@@ -19012,7 +21141,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -22654,7 +22725,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`
-@@ -19032,8 +21146,12 @@
+@@ -19031,8 +21160,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -22667,7 +22738,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19041,22 +21159,23 @@
+@@ -19040,22 +21173,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -22698,7 +22769,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19072,24 +21191,36 @@
+@@ -19071,24 +21205,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22743,7 +22814,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19103,19 +21234,20 @@
+@@ -19102,19 +21248,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22751,7 +22822,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -22769,7 +22840,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19134,24 +21266,36 @@
+@@ -19133,24 +21280,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22814,7 +22885,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19165,8 +21309,10 @@
+@@ -19164,8 +21323,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22822,11 +22893,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19175,13 +21321,11 @@
+@@ -19174,13 +21335,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -22843,7 +22914,7 @@
fi
fi
;;
-@@ -19194,7 +21338,7 @@
+@@ -19193,7 +21352,7 @@
ld_shlibs_GCJ=no
;;
@@ -22852,7 +22923,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19204,68 +21348,68 @@
+@@ -19203,68 +21362,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -22965,7 +23036,7 @@
fi
;;
-@@ -19299,8 +21443,8 @@
+@@ -19298,8 +21457,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22976,7 +23047,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19308,7 +21452,7 @@
+@@ -19307,7 +21466,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -22985,7 +23056,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
-@@ -19322,47 +21466,62 @@
+@@ -19321,47 +21480,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23072,7 +23143,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19376,7 +21535,7 @@
+@@ -19375,7 +21549,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23081,7 +23152,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'
-@@ -19386,7 +21545,7 @@
+@@ -19385,7 +21559,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23090,7 +23161,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
-@@ -19409,7 +21568,8 @@
+@@ -19408,7 +21582,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
@@ -23100,7 +23171,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19419,7 +21579,7 @@
+@@ -19418,7 +21593,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23109,7 +23180,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19430,14 +21590,14 @@
+@@ -19429,14 +21604,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23126,7 +23197,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'
-@@ -19449,13 +21609,13 @@
+@@ -19448,13 +21623,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23142,7 +23213,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19463,21 +21623,15 @@
+@@ -19462,21 +21637,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23168,7 +23239,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'
-@@ -19486,8 +21640,18 @@
+@@ -19485,8 +21654,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23189,7 +23260,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19496,7 +21660,7 @@
+@@ -19495,7 +21674,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.
@@ -23198,7 +23269,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19544,36 +21708,45 @@
+@@ -19543,36 +21722,45 @@
fi
;;
@@ -23265,7 +23336,7 @@
;;
uts4*)
-@@ -19588,15 +21761,10 @@
+@@ -19587,15 +21775,10 @@
esac
fi
@@ -23283,7 +23354,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19614,8 +21782,8 @@
+@@ -19613,8 +21796,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.
@@ -23294,7 +23365,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19629,6 +21797,7 @@
+@@ -19628,6 +21811,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -23302,7 +23373,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19651,20 +21820,20 @@
+@@ -19650,20 +21834,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23328,7 +23399,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19674,7 +21843,20 @@
+@@ -19673,7 +21857,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23350,7 +23421,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19739,7 +21921,7 @@
+@@ -19738,7 +21935,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23359,7 +23430,7 @@
;;
beos*)
-@@ -19748,7 +21930,7 @@
+@@ -19747,7 +21944,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23368,7 +23439,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19764,7 +21946,7 @@
+@@ -19763,7 +21960,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23377,7 +23448,7 @@
need_version=no
need_lib_prefix=no
-@@ -19776,7 +21958,8 @@
+@@ -19775,7 +21972,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23387,7 +23458,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19806,7 +21989,7 @@
+@@ -19805,7 +22003,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23396,7 +23467,7 @@
;;
esac
;;
-@@ -19829,7 +22012,7 @@
+@@ -19828,7 +22026,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23405,7 +23476,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"`
-@@ -19852,20 +22035,17 @@
+@@ -19851,20 +22049,17 @@
dynamic_linker=no
;;
@@ -23437,7 +23508,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19883,14 +22063,19 @@
+@@ -19882,14 +22077,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -23459,7 +23530,7 @@
esac
;;
-@@ -19910,9 +22095,9 @@
+@@ -19909,9 +22109,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -23471,7 +23542,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19927,7 +22112,7 @@
+@@ -19926,7 +22126,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -23480,7 +23551,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19938,7 +22123,7 @@
+@@ -19937,7 +22137,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -23489,10 +23560,13 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19950,6 +22135,18 @@
+@@ -19949,9 +22149,21 @@
postinstall_cmds='chmod 555 $lib'
;;
+-irix5* | irix6* | nonstopux*)
+- case $host_os in
+- nonstopux*) version_type=nonstopux ;;
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
@@ -23505,21 +23579,27 @@
+ hardcode_into_libs=yes
+ ;;
+
- irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-@@ -19993,29 +22190,26 @@
- ;;
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux
+@@ -19988,1068 +22200,268 @@
- # This must be Linux ELF.
+ # No shared lib support for Linux oldld, aout, or coff.
+ linux*oldld* | linux*aout* | linux*coff*)
+- dynamic_linker=no
+- ;;
+-
+-# This must be Linux ELF.
-linux*)
-+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
@@ -23527,80 +23607,100 @@
- libsuff=64
- fi
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
-@@ -20025,6 +22219,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -20034,7 +22240,7 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- # We used to test for /lib/ld.so.1 and disable shared libraries on
+- # powerpc, because MkLinux only supported shared libraries with the
+- # GNU dynamic linker. Since this was broken with cross compilers,
+- # most powerpc-linux boxes support dynamic linking these days and
+- # people can always --disable-shared, the test was removed, and we
+- # assume the GNU/Linux dynamic linker is in use.
+- dynamic_linker='GNU/Linux ld.so'
+- ;;
+-
+-netbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- dynamic_linker='NetBSD (a.out) ld.so'
+- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
-@@ -20062,8 +22268,13 @@
-
- openbsd*)
- version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- dynamic_linker='NetBSD ld.elf_so'
+- fi
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+-
+-newsos6)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-nto-qnx*)
+- version_type=linux
+- need_lib_prefix=no
- need_version=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
-+ esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
-@@ -20083,7 +22294,7 @@
-
- os2*)
- libname_spec='$name'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-openbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- case $host_os in
+- openbsd2.[89] | openbsd2.[89].*)
+- shlibpath_overrides_runpath=no
+- ;;
+- *)
+- shlibpath_overrides_runpath=yes
+- ;;
+- esac
+- else
+- shlibpath_overrides_runpath=yes
+- fi
+- ;;
+-
+-os2*)
+- libname_spec='$name'
- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -20101,13 +22312,6 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
+- need_lib_prefix=no
+- library_names_spec='$libname${shared_ext} $libname.a'
+- dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=LIBPATH
+- ;;
+-
+-osf3* | osf4* | osf5*)
+- version_type=osf
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+- ;;
+-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
@@ -23608,32 +23708,69 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -20133,7 +22337,7 @@
- need_version=yes
- ;;
-
+-solaris*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- # ldd complains unless libraries are executable
+- postinstall_cmds='chmod +x $lib'
+- ;;
+-
+-sunos4*)
+- version_type=sunos
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- fi
+- need_version=yes
+- ;;
+-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-@@ -20166,891 +22370,84 @@
- fi
- ;;
-
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- sni)
+- shlibpath_overrides_runpath=no
+- need_lib_prefix=no
+- export_dynamic_flag_spec='${wl}-Blargedynsym'
+- runpath_var=LD_RUN_PATH
+- ;;
+- siemens)
+- need_lib_prefix=no
+- ;;
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+- ;;
+- esac
+- ;;
+-
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
+- ;;
+-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
@@ -24278,25 +24415,76 @@
-
-fi
-
--
++ dynamic_linker=no
++ ;;
+
-fi
--
--
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ # This implies no fast_install, which is unacceptable.
++ # Some rework will be needed to allow for fast_install
++ # before this can be enabled.
++ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
+
-fi
--
++ # We used to test for /lib/ld.so.1 and disable shared libraries on
++ # powerpc, because MkLinux only supported shared libraries with the
++ # GNU dynamic linker. Since this was broken with cross compilers,
++ # most powerpc-linux boxes support dynamic linking these days and
++ # people can always --disable-shared, the test was removed, and we
++ # assume the GNU/Linux dynamic linker is in use.
++ dynamic_linker='GNU/Linux ld.so'
++ ;;
+
- ;;
- esac
--
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
+
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-+ hardcode_into_libs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ shlibpath_overrides_runpath=no
++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
- enable_dlopen=no
-- fi
--
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
+ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
@@ -24307,7 +24495,13 @@
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
--
++newsos6)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
- 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
@@ -24319,15 +24513,57 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20855 "configure"
+-#line 20854 "configure"
-#include "confdefs.h"
--
++nto-qnx*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
--
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
++ else
++ shlibpath_overrides_runpath=yes
++ fi
++ ;;
+
-#include <stdio.h>
--
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
++ shlibpath_var=LIBPATH
++ ;;
+
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -24337,7 +24573,17 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
--
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -24359,24 +24605,78 @@
-# endif
-# endif
-#endif
--
++solaris*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
+
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
++ fi
++ need_version=yes
++ ;;
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++sysv4 | sysv4.3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_vendor in
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
++ esac
++ ;;
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++sysv4*MP*)
++ if test -d /usr/nec ;then
++ version_type=linux
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ fi
++ ;;
+
- exit (status);
-}
-EOF
@@ -24391,11 +24691,29 @@
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-- esac
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
+ esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
-- fi
+ fi
-fi
-rm -fr conftest*
-
@@ -24417,7 +24735,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20953 "configure"
+-#line 20952 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -24461,20 +24779,35 @@
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
--
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
+
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
--
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
--
++*)
++ dynamic_linker=no
++ ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+
- exit (status);
-}
-EOF
@@ -24493,47 +24826,13 @@
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
- fi
--fi
--rm -fr conftest*
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-
+- fi
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-- fi
+-rm -fr conftest*
-- CPPFLAGS="$save_CPPFLAGS"
-- LDFLAGS="$save_LDFLAGS"
-- LIBS="$save_LIBS"
-- ;;
-- esac
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+hardcode_action_GCJ=
@@ -24541,10 +24840,6 @@
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-- case $lt_cv_dlopen_self in
-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-- *) enable_dlopen_self=unknown ;;
-- esac
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -24562,7 +24857,21 @@
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
+-
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
+-
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
@@ -24580,7 +24889,7 @@
fi
-@@ -21067,7 +22464,8 @@
+@@ -21066,7 +22478,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.
@@ -24590,7 +24899,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 \
-@@ -21167,6 +22565,12 @@
+@@ -21166,6 +22579,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24603,7 +24912,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21178,6 +22582,9 @@
+@@ -21177,6 +22596,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24613,7 +24922,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21197,7 +22604,7 @@
+@@ -21196,7 +22618,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24622,7 +24931,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21228,7 +22635,7 @@
+@@ -21227,7 +22649,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24631,7 +24940,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21243,7 +22650,7 @@
+@@ -21242,7 +22664,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -24640,7 +24949,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21445,7 +22852,10 @@
+@@ -21444,7 +22866,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.
@@ -24652,7 +24961,7 @@
fi
-@@ -21465,7 +22875,6 @@
+@@ -21464,7 +22889,6 @@
RC)
@@ -24660,7 +24969,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21484,15 +22893,42 @@
+@@ -21483,15 +22907,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -24703,7 +25012,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21508,7 +22944,8 @@
+@@ -21507,7 +22958,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.
@@ -24713,7 +25022,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 \
-@@ -21608,6 +23045,12 @@
+@@ -21607,6 +23059,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24726,7 +25035,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21619,6 +23062,9 @@
+@@ -21618,6 +23076,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24736,7 +25045,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21638,7 +23084,7 @@
+@@ -21637,7 +23098,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24745,7 +25054,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21669,7 +23115,7 @@
+@@ -21668,7 +23129,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24754,7 +25063,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21684,7 +23130,7 @@
+@@ -21683,7 +23144,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -24763,7 +25072,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21886,7 +23332,10 @@
+@@ -21885,7 +23346,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.
@@ -24775,7 +25084,7 @@
fi
-@@ -21933,7 +23382,7 @@
+@@ -21932,7 +23396,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -24784,7 +25093,7 @@
# Prevent multiple expansion
-@@ -21988,8 +23437,8 @@
+@@ -21987,8 +23451,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -24795,7 +25104,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22015,17 +23464,17 @@
+@@ -22014,17 +23478,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -24819,7 +25128,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22040,32 +23489,33 @@
+@@ -22039,32 +23503,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24861,7 +25170,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22074,8 +23524,8 @@
+@@ -22073,8 +23538,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -24872,7 +25181,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22101,11 +23551,11 @@
+@@ -22100,11 +23565,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -24888,7 +25197,7 @@
fi
-@@ -22113,8 +23563,8 @@
+@@ -22112,8 +23577,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -24899,7 +25208,7 @@
XGETTEXT=":"
fi
fi
-@@ -22124,8 +23574,7 @@
+@@ -22123,8 +23588,7 @@
@@ -24909,7 +25218,7 @@
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 +23586,8 @@
+@@ -22136,8 +23600,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -24920,7 +25229,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22166,24 +23615,36 @@
+@@ -22165,24 +23629,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -24965,7 +25274,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22192,15 +23653,16 @@
+@@ -22191,15 +23667,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24986,7 +25295,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22229,15 +23691,14 @@
+@@ -22228,15 +23705,14 @@
@@ -25005,7 +25314,7 @@
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 +23710,6 @@
+@@ -22248,9 +23724,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25015,7 +25324,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22277,24 +23735,36 @@
+@@ -22276,24 +23749,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25060,7 +25369,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22303,9 +23773,10 @@
+@@ -22302,9 +23787,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25073,7 +25382,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22318,11 +23789,11 @@
+@@ -22317,11 +23803,11 @@
fi
@@ -25089,7 +25398,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22343,8 +23814,7 @@
+@@ -22342,8 +23828,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -25099,7 +25408,7 @@
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'
-@@ -22382,24 +23852,36 @@
+@@ -22381,24 +23866,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25144,7 +25453,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22409,10 +23891,11 @@
+@@ -22408,10 +23905,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25154,11 +25463,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22425,8 +23908,8 @@
+@@ -22424,8 +23922,8 @@
fi
@@ -25169,7 +25478,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22450,15 +23933,14 @@
+@@ -22449,15 +23947,14 @@
@@ -25188,7 +25497,7 @@
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 +23952,6 @@
+@@ -22469,9 +23966,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25198,7 +25507,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22497,24 +23976,36 @@
+@@ -22496,24 +23990,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25243,7 +25552,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22523,9 +24014,10 @@
+@@ -22522,9 +24028,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25256,7 +25565,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22538,11 +24030,11 @@
+@@ -22537,11 +24044,11 @@
fi
@@ -25272,7 +25581,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22563,8 +24055,7 @@
+@@ -22562,8 +24069,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -25282,7 +25591,7 @@
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'
-@@ -22601,24 +24092,36 @@
+@@ -22600,24 +24106,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25327,7 +25636,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22628,10 +24131,11 @@
+@@ -22627,10 +24145,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25337,11 +25646,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22644,8 +24148,8 @@
+@@ -22643,8 +24162,8 @@
fi
@@ -25352,7 +25661,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22668,8 +24172,8 @@
+@@ -22667,8 +24186,8 @@
@@ -25363,7 +25672,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22686,30 +24190,42 @@
+@@ -22685,30 +24204,42 @@
int
main ()
{
@@ -25415,7 +25724,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22718,20 +24234,21 @@
+@@ -22717,20 +24248,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25424,7 +25733,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25443,7 +25752,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22748,30 +24265,42 @@
+@@ -22747,30 +24279,42 @@
int
main ()
{
@@ -25495,7 +25804,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22780,21 +24309,22 @@
+@@ -22779,21 +24323,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25504,7 +25813,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25524,7 +25833,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22807,40 +24337,52 @@
+@@ -22806,40 +24351,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25589,7 +25898,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22849,19 +24391,20 @@
+@@ -22848,19 +24405,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25598,7 +25907,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25616,7 +25925,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22874,40 +24417,52 @@
+@@ -22873,40 +24431,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25681,7 +25990,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22916,14 +24471,15 @@
+@@ -22915,14 +24485,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25690,7 +25999,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25701,7 +26010,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22949,13 +24505,13 @@
+@@ -22948,13 +24519,13 @@
fi
@@ -25718,7 +26027,7 @@
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'
-@@ -22984,24 +24540,36 @@
+@@ -22983,24 +24554,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25763,7 +26072,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23013,8 +24581,10 @@
+@@ -23012,8 +24595,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25775,7 +26084,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23024,17 +24594,17 @@
+@@ -23023,17 +24608,17 @@
fi
@@ -25798,7 +26107,7 @@
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'
-@@ -23063,24 +24633,36 @@
+@@ -23062,24 +24647,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25843,7 +26152,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23092,8 +24674,10 @@
+@@ -23091,8 +24688,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25855,7 +26164,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23104,8 +24688,8 @@
+@@ -23103,8 +24702,8 @@
fi
@@ -25866,7 +26175,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23118,8 +24702,8 @@
+@@ -23117,8 +24716,8 @@
_ACEOF
@@ -25877,7 +26186,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23132,40 +24716,52 @@
+@@ -23131,40 +24730,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25942,7 +26251,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23174,21 +24770,22 @@
+@@ -23173,21 +24784,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25951,7 +26260,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -25971,7 +26280,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23201,40 +24798,52 @@
+@@ -23200,40 +24812,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26036,7 +26345,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23243,21 +24852,22 @@
+@@ -23242,21 +24866,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26045,7 +26354,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26065,7 +26374,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23284,53 +24894,59 @@
+@@ -23283,53 +24908,59 @@
#undef inet_ntoa
@@ -26144,7 +26453,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23339,17 +24955,18 @@
+@@ -23338,17 +24969,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26153,7 +26462,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -26169,7 +26478,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23362,40 +24979,52 @@
+@@ -23361,40 +24993,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26234,7 +26543,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23404,21 +25033,22 @@
+@@ -23403,21 +25047,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26243,7 +26552,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26263,7 +26572,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23445,53 +25075,59 @@
+@@ -23444,53 +25089,59 @@
#undef connect
@@ -26342,7 +26651,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23500,17 +25136,18 @@
+@@ -23499,17 +25150,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26351,7 +26660,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -26367,7 +26676,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23523,40 +25160,52 @@
+@@ -23522,40 +25174,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26432,7 +26741,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23565,22 +25214,23 @@
+@@ -23564,22 +25228,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26441,7 +26750,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26462,7 +26771,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23607,53 +25257,59 @@
+@@ -23606,53 +25271,59 @@
#undef remove
@@ -26541,7 +26850,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23662,17 +25318,18 @@
+@@ -23661,17 +25332,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26550,7 +26859,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -26566,7 +26875,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23685,40 +25342,52 @@
+@@ -23684,40 +25356,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26631,7 +26940,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23727,14 +25396,15 @@
+@@ -23726,14 +25410,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26640,7 +26949,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26651,7 +26960,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23742,8 +25412,8 @@
+@@ -23741,8 +25426,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -26662,7 +26971,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23770,53 +25440,59 @@
+@@ -23769,53 +25454,59 @@
#undef shmat
@@ -26741,7 +27050,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23825,18 +25501,19 @@
+@@ -23824,18 +25515,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26750,7 +27059,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -26767,7 +27076,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23849,40 +25526,52 @@
+@@ -23848,40 +25540,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26832,7 +27141,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23891,14 +25580,15 @@
+@@ -23890,14 +25594,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26841,7 +27150,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -26852,7 +27161,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23912,18 +25602,19 @@
+@@ -23911,18 +25616,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -26880,7 +27189,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23934,24 +25625,36 @@
+@@ -23933,24 +25639,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -26925,7 +27234,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23960,15 +25663,16 @@
+@@ -23959,15 +25677,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26948,7 +27257,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23977,8 +25681,13 @@
+@@ -23976,8 +25695,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -26964,7 +27273,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24002,9 +25711,10 @@
+@@ -24001,9 +25725,10 @@
ac_header_preproc=no
fi
@@ -26977,7 +27286,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24028,25 +25738,19 @@
+@@ -24027,25 +25752,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;}
@@ -27010,7 +27319,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24064,18 +25768,19 @@
+@@ -24063,18 +25782,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27038,7 +27347,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24086,24 +25791,36 @@
+@@ -24085,24 +25805,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27083,7 +27392,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24112,15 +25829,16 @@
+@@ -24111,15 +25843,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27106,7 +27415,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24129,8 +25847,13 @@
+@@ -24128,8 +25861,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27122,7 +27431,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24154,9 +25877,10 @@
+@@ -24153,9 +25891,10 @@
ac_header_preproc=no
fi
@@ -27135,7 +27444,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24180,25 +25904,19 @@
+@@ -24179,25 +25918,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;}
@@ -27168,7 +27477,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24212,8 +25930,8 @@
+@@ -24211,8 +25944,8 @@
# darwin requires a poll emulation library
@@ -27179,7 +27488,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24226,40 +25944,52 @@
+@@ -24225,40 +25958,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27244,7 +27553,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24268,14 +25998,15 @@
+@@ -24267,14 +26012,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27253,7 +27562,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27264,7 +27573,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24286,18 +26017,19 @@
+@@ -24285,18 +26031,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27292,7 +27601,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24308,24 +26040,36 @@
+@@ -24307,24 +26054,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27337,7 +27646,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24334,15 +26078,16 @@
+@@ -24333,15 +26092,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27360,7 +27669,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24351,8 +26096,13 @@
+@@ -24350,8 +26110,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27376,7 +27685,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24376,9 +26126,10 @@
+@@ -24375,9 +26140,10 @@
ac_header_preproc=no
fi
@@ -27389,7 +27698,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24402,25 +26153,19 @@
+@@ -24401,25 +26167,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;}
@@ -27422,7 +27731,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24435,17 +26180,17 @@
+@@ -24434,17 +26194,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -27446,7 +27755,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24456,24 +26201,36 @@
+@@ -24455,24 +26215,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -27491,7 +27800,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24482,15 +26239,16 @@
+@@ -24481,15 +26253,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27514,7 +27823,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24499,8 +26257,13 @@
+@@ -24498,8 +26271,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -27530,7 +27839,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24524,9 +26287,10 @@
+@@ -24523,9 +26301,10 @@
ac_header_preproc=no
fi
@@ -27543,7 +27852,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24550,25 +26314,18 @@
+@@ -24549,25 +26328,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;}
@@ -27574,7 +27883,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24585,8 +26342,8 @@
+@@ -24584,8 +26356,8 @@
@@ -27585,7 +27894,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24612,31 +26369,43 @@
+@@ -24611,31 +26383,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27639,7 +27948,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24647,25 +26416,25 @@
+@@ -24646,25 +26430,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27651,7 +27960,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -27672,7 +27981,7 @@
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 +26446,6 @@
+@@ -24676,9 +26460,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27682,7 +27991,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24705,24 +26471,36 @@
+@@ -24704,24 +26485,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27727,7 +28036,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24731,9 +26509,10 @@
+@@ -24730,9 +26523,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27740,7 +28049,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24746,11 +26525,11 @@
+@@ -24745,11 +26539,11 @@
fi
@@ -27756,7 +28065,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24771,8 +26550,7 @@
+@@ -24770,8 +26564,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -27766,7 +28075,7 @@
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'
-@@ -24810,24 +26588,36 @@
+@@ -24809,24 +26602,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27811,7 +28120,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24837,10 +26627,11 @@
+@@ -24836,10 +26641,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27821,11 +28130,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -24853,8 +26644,8 @@
+@@ -24852,8 +26658,8 @@
fi
@@ -27836,7 +28145,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24881,8 +26672,8 @@
+@@ -24880,8 +26686,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -27847,7 +28156,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24895,40 +26686,52 @@
+@@ -24894,40 +26700,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27912,7 +28221,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24937,27 +26740,28 @@
+@@ -24936,27 +26754,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27921,7 +28230,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27951,7 +28260,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24970,40 +26774,52 @@
+@@ -24969,40 +26788,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28016,7 +28325,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25012,22 +26828,23 @@
+@@ -25011,22 +26842,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28025,7 +28334,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28046,7 +28355,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25038,36 +26855,49 @@
+@@ -25037,36 +26869,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28106,7 +28415,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25076,20 +26906,21 @@
+@@ -25075,23 +26920,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28124,22 +28433,29 @@
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_int" = yes; then
+- 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 +26933,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25101,10 +26946,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28148,7 +28464,7 @@
test_array [0] = 0
;
-@@ -25113,24 +26945,36 @@
+@@ -25112,24 +26959,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28193,11 +28509,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25143,10 +26987,11 @@
+@@ -25142,10 +27001,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28206,7 +28523,7 @@
test_array [0] = 0
;
-@@ -25154,24 +26999,36 @@
+@@ -25153,24 +27014,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28251,7 +28568,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25180,30 +27037,32 @@
+@@ -25179,30 +27052,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28284,7 +28601,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28293,7 +28611,7 @@
test_array [0] = 0
;
-@@ -25211,24 +27070,36 @@
+@@ -25210,24 +27086,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28338,11 +28656,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25241,10 +27112,11 @@
+@@ -25240,10 +27128,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28351,7 +28670,7 @@
test_array [0] = 0
;
-@@ -25252,24 +27124,36 @@
+@@ -25251,24 +27141,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28396,7 +28715,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25278,24 +27162,27 @@
+@@ -25277,24 +27179,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28434,11 +28753,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25306,10 +27193,11 @@
+@@ -25305,10 +27210,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28447,7 +28767,7 @@
test_array [0] = 0
;
-@@ -25317,24 +27205,36 @@
+@@ -25316,24 +27223,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28492,7 +28812,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25343,26 +27243,20 @@
+@@ -25342,26 +27261,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28506,13 +28826,17 @@
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)
++'') if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -28525,19 +28849,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25370,8 +27264,9 @@
+@@ -25369,8 +27286,10 @@
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_;
++ 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,35 +27275,44 @@
+@@ -25379,35 +27298,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28595,12 +28920,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25419,28 +27323,27 @@
+@@ -25418,28 +27346,31 @@
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)
++if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
@@ -28609,18 +28935,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_int=0
+-else
+- ac_cv_sizeof_int=0
fi
- 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
@@ -28632,7 +28964,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25451,36 +27354,49 @@
+@@ -25450,36 +27381,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28692,7 +29024,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25489,20 +27405,21 @@
+@@ -25488,23 +27432,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28710,22 +29042,29 @@
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_short" = yes; then
+- 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 +27432,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25514,10 +27458,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -28734,7 +29073,7 @@
test_array [0] = 0
;
-@@ -25526,24 +27444,36 @@
+@@ -25525,24 +27471,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28779,11 +29118,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25556,10 +27486,11 @@
+@@ -25555,10 +27513,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -28792,7 +29132,7 @@
test_array [0] = 0
;
-@@ -25567,24 +27498,36 @@
+@@ -25566,24 +27526,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28837,7 +29177,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25593,30 +27536,32 @@
+@@ -25592,30 +27564,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28870,7 +29210,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -28879,7 +29220,7 @@
test_array [0] = 0
;
-@@ -25624,24 +27569,36 @@
+@@ -25623,24 +27598,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28924,11 +29265,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25654,10 +27611,11 @@
+@@ -25653,10 +27640,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -28937,7 +29279,7 @@
test_array [0] = 0
;
-@@ -25665,24 +27623,36 @@
+@@ -25664,24 +27653,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28982,7 +29324,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25691,24 +27661,27 @@
+@@ -25690,24 +27691,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29020,11 +29362,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25719,10 +27692,11 @@
+@@ -25718,10 +27722,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29033,7 +29376,7 @@
test_array [0] = 0
;
-@@ -25730,24 +27704,36 @@
+@@ -25729,24 +27735,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29078,7 +29421,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25756,26 +27742,20 @@
+@@ -25755,26 +27773,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29092,13 +29435,17 @@
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)
++'') if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -29111,19 +29458,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25783,8 +27763,9 @@
+@@ -25782,8 +27798,10 @@
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_;
++ 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,35 +27774,44 @@
+@@ -25792,35 +27810,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29181,12 +29529,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25832,28 +27822,27 @@
+@@ -25831,28 +27858,31 @@
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)
++if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
@@ -29195,18 +29544,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_short=0
+-else
+- ac_cv_sizeof_short=0
+-fi
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
@@ -29218,7 +29573,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25864,36 +27853,49 @@
+@@ -25863,36 +27893,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29278,7 +29633,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25902,20 +27904,21 @@
+@@ -25901,23 +27944,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29296,22 +29651,29 @@
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long" = yes; then
+- 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 +27931,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25927,10 +27970,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29320,7 +29682,7 @@
test_array [0] = 0
;
-@@ -25939,24 +27943,36 @@
+@@ -25938,24 +27983,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29365,11 +29727,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25969,10 +27985,11 @@
+@@ -25968,10 +28025,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29378,7 +29741,7 @@
test_array [0] = 0
;
-@@ -25980,24 +27997,36 @@
+@@ -25979,24 +28038,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29423,7 +29786,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26006,30 +28035,32 @@
+@@ -26005,30 +28076,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29456,7 +29819,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29465,7 +29829,7 @@
test_array [0] = 0
;
-@@ -26037,24 +28068,36 @@
+@@ -26036,24 +28110,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29510,11 +29874,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26067,10 +28110,11 @@
+@@ -26066,10 +28152,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29523,7 +29888,7 @@
test_array [0] = 0
;
-@@ -26078,24 +28122,36 @@
+@@ -26077,24 +28165,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29568,7 +29933,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26104,24 +28160,27 @@
+@@ -26103,24 +28203,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29606,11 +29971,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26132,10 +28191,11 @@
+@@ -26131,10 +28234,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29619,7 +29985,7 @@
test_array [0] = 0
;
-@@ -26143,24 +28203,36 @@
+@@ -26142,24 +28247,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29664,7 +30030,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26169,26 +28241,20 @@
+@@ -26168,26 +28285,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29678,13 +30044,17 @@
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)
++'') if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -29697,19 +30067,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26196,8 +28262,9 @@
+@@ -26195,8 +28310,10 @@
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_;
++ 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,35 +28273,44 @@
+@@ -26205,35 +28322,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29767,12 +30138,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26245,28 +28321,27 @@
+@@ -26244,28 +28370,31 @@
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)
++if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
@@ -29781,18 +30153,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_long=0
+-else
+- ac_cv_sizeof_long=0
fi
- 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
@@ -29804,7 +30182,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26277,36 +28352,49 @@
+@@ -26276,36 +28405,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29864,7 +30242,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26315,20 +28403,21 @@
+@@ -26314,23 +28456,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29882,22 +30260,29 @@
-echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_char_p" = yes; then
+- 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 +28430,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26340,10 +28482,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -29906,7 +30291,7 @@
test_array [0] = 0
;
-@@ -26352,24 +28442,36 @@
+@@ -26351,24 +28495,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29951,11 +30336,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26382,10 +28484,11 @@
+@@ -26381,10 +28537,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -29964,7 +30350,7 @@
test_array [0] = 0
;
-@@ -26393,24 +28496,36 @@
+@@ -26392,24 +28550,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30009,7 +30395,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26419,30 +28534,32 @@
+@@ -26418,30 +28588,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30042,7 +30428,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30051,7 +30438,7 @@
test_array [0] = 0
;
-@@ -26450,24 +28567,36 @@
+@@ -26449,24 +28622,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30096,11 +30483,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26480,10 +28609,11 @@
+@@ -26479,10 +28664,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30109,7 +30497,7 @@
test_array [0] = 0
;
-@@ -26491,24 +28621,36 @@
+@@ -26490,24 +28677,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30154,7 +30542,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26517,24 +28659,27 @@
+@@ -26516,24 +28715,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30192,11 +30580,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26545,10 +28690,11 @@
+@@ -26544,10 +28746,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30205,7 +30594,7 @@
test_array [0] = 0
;
-@@ -26556,24 +28702,36 @@
+@@ -26555,24 +28759,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30250,7 +30639,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26582,26 +28740,20 @@
+@@ -26581,26 +28797,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30264,13 +30653,17 @@
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 *)
++'') if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -30283,19 +30676,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26609,8 +28761,9 @@
+@@ -26608,8 +28822,10 @@
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_;
++ 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,35 +28772,44 @@
+@@ -26618,35 +28834,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30353,12 +30747,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26658,30 +28820,29 @@
+@@ -26657,30 +28882,33 @@
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 *)
++if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
@@ -30367,18 +30762,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_char_p=0
+-else
+- ac_cv_sizeof_char_p=0
+-fi
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
@@ -30392,7 +30793,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26694,40 +28855,52 @@
+@@ -26693,40 +28921,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30457,7 +30858,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26736,14 +28909,15 @@
+@@ -26735,14 +28975,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30466,7 +30867,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30477,7 +30878,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26752,8 +28926,8 @@
+@@ -26751,8 +28992,8 @@
fi
@@ -30488,7 +30889,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26766,40 +28940,52 @@
+@@ -26765,40 +29006,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30553,7 +30954,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26808,14 +28994,15 @@
+@@ -26807,14 +29060,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30562,7 +30963,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -30573,7 +30974,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26829,8 +29016,8 @@
+@@ -26828,8 +29082,8 @@
@@ -30584,7 +30985,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26841,36 +29028,49 @@
+@@ -26840,36 +29094,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30644,7 +31045,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26879,20 +29079,21 @@
+@@ -26878,23 +29145,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30662,22 +31063,29 @@
-echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of size_t" >&5
+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_size_t" = yes; then
+- 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 +29106,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26904,10 +29171,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -30686,7 +31094,7 @@
test_array [0] = 0
;
-@@ -26916,24 +29118,36 @@
+@@ -26915,24 +29184,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30731,11 +31139,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26946,10 +29160,11 @@
+@@ -26945,10 +29226,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -30744,7 +31153,7 @@
test_array [0] = 0
;
-@@ -26957,24 +29172,36 @@
+@@ -26956,24 +29239,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30789,7 +31198,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26983,30 +29210,32 @@
+@@ -26982,30 +29277,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30822,7 +31231,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -30831,7 +31241,7 @@
test_array [0] = 0
;
-@@ -27014,24 +29243,36 @@
+@@ -27013,24 +29311,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30876,11 +31286,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27044,10 +29285,11 @@
+@@ -27043,10 +29353,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -30889,7 +31300,7 @@
test_array [0] = 0
;
-@@ -27055,24 +29297,36 @@
+@@ -27054,24 +29366,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30934,7 +31345,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27081,24 +29335,27 @@
+@@ -27080,24 +29404,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30972,11 +31383,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27109,10 +29366,11 @@
+@@ -27108,10 +29435,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -30985,7 +31397,7 @@
test_array [0] = 0
;
-@@ -27120,24 +29378,36 @@
+@@ -27119,24 +29448,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31030,7 +31442,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27146,26 +29416,20 @@
+@@ -27145,26 +29486,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31044,13 +31456,17 @@
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)
++'') if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 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; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -31063,19 +31479,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27173,8 +29437,9 @@
+@@ -27172,8 +29511,10 @@
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_;
++ 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,35 +29448,44 @@
+@@ -27182,35 +29523,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31133,12 +31550,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27222,29 +29496,28 @@
+@@ -27221,29 +29571,32 @@
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)
++if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
+echo "$as_me: error: cannot compute sizeof (size_t)
@@ -31147,18 +31565,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_size_t=0
+-else
+- ac_cv_sizeof_size_t=0
fi
- 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
@@ -31171,7 +31595,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27255,36 +29528,49 @@
+@@ -27254,36 +29607,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31231,7 +31655,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27293,20 +29579,21 @@
+@@ -27292,23 +29658,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31249,22 +31673,29 @@
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_unsigned_long" = yes; then
+- 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 +29606,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27318,10 +29684,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31273,7 +31704,7 @@
test_array [0] = 0
;
-@@ -27330,24 +29618,36 @@
+@@ -27329,24 +29697,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31318,11 +31749,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27360,10 +29660,11 @@
+@@ -27359,10 +29739,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31331,7 +31763,7 @@
test_array [0] = 0
;
-@@ -27371,24 +29672,36 @@
+@@ -27370,24 +29752,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31376,7 +31808,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27397,30 +29710,32 @@
+@@ -27396,30 +29790,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31409,7 +31841,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31418,7 +31851,7 @@
test_array [0] = 0
;
-@@ -27428,24 +29743,36 @@
+@@ -27427,24 +29824,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31463,11 +31896,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27458,10 +29785,11 @@
+@@ -27457,10 +29866,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31476,7 +31910,7 @@
test_array [0] = 0
;
-@@ -27469,24 +29797,36 @@
+@@ -27468,24 +29879,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31521,7 +31955,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27495,24 +29835,27 @@
+@@ -27494,24 +29917,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31559,11 +31993,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27523,10 +29866,11 @@
+@@ -27522,10 +29948,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -31572,7 +32007,7 @@
test_array [0] = 0
;
-@@ -27534,24 +29878,36 @@
+@@ -27533,24 +29961,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31617,7 +32052,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27560,26 +29916,20 @@
+@@ -27559,26 +29999,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31631,13 +32066,17 @@
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)
++'') if test "$ac_cv_type_unsigned_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 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; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -31650,19 +32089,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27587,8 +29937,9 @@
+@@ -27586,8 +30024,10 @@
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_;
++ 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,35 +29948,44 @@
+@@ -27596,35 +30036,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31720,12 +32160,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27636,30 +29996,29 @@
+@@ -27635,30 +30084,33 @@
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)
++if test "$ac_cv_type_unsigned_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+echo "$as_me: error: cannot compute sizeof (unsigned long)
@@ -31734,18 +32175,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_unsigned_long=0
+-else
+- ac_cv_sizeof_unsigned_long=0
+-fi
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
@@ -31759,7 +32206,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27680,36 +30039,48 @@
+@@ -27679,36 +30131,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31820,7 +32267,7 @@
{ { 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 +30092,18 @@
+@@ -27720,18 +30184,18 @@
{ (exit 1); exit 1; }; }
fi
@@ -31844,7 +32291,7 @@
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'
-@@ -27762,24 +30133,36 @@
+@@ -27761,24 +30225,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -31889,7 +32336,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27788,9 +30171,10 @@
+@@ -27787,9 +30263,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31898,11 +32345,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -27803,26 +30187,26 @@
+@@ -27802,26 +30279,26 @@
fi
@@ -31939,7 +32386,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27841,18 +30225,19 @@
+@@ -27840,18 +30317,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -31967,7 +32414,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27863,24 +30248,36 @@
+@@ -27862,24 +30340,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -32012,7 +32459,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27889,15 +30286,16 @@
+@@ -27888,15 +30378,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32035,7 +32482,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27906,8 +30304,13 @@
+@@ -27905,8 +30396,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -32051,7 +32498,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27931,9 +30334,10 @@
+@@ -27930,9 +30426,10 @@
ac_header_preproc=no
fi
@@ -32064,7 +32511,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27957,25 +30361,19 @@
+@@ -27956,25 +30453,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;}
@@ -32097,7 +32544,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27987,8 +30385,8 @@
+@@ -27986,8 +30477,8 @@
done
@@ -32108,7 +32555,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28015,53 +30413,59 @@
+@@ -28014,53 +30505,59 @@
#undef _NSGetEnviron
@@ -32187,7 +32634,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28070,13 +30474,14 @@
+@@ -28069,13 +30566,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32196,7 +32643,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -32206,7 +32653,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28097,9 +30502,9 @@
+@@ -28096,9 +30594,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32219,7 +32666,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28125,53 +30530,59 @@
+@@ -28124,53 +30622,59 @@
#undef $ac_func
@@ -32298,7 +32745,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28180,13 +30591,15 @@
+@@ -28179,13 +30683,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32307,7 +32754,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -32318,7 +32765,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28203,32 +30616,32 @@
+@@ -28202,32 +30708,32 @@
@@ -32363,7 +32810,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28244,8 +30657,8 @@
+@@ -28243,8 +30749,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -32374,7 +32821,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28282,8 +30695,13 @@
+@@ -28281,8 +30787,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -32390,7 +32837,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28350,6 +30768,7 @@
+@@ -28349,6 +30860,7 @@
fi
done
fi
@@ -32398,7 +32845,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28379,24 +30798,36 @@
+@@ -28378,24 +30890,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32443,7 +32890,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28407,7 +30838,7 @@
+@@ -28406,7 +30930,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32452,17 +32899,17 @@
# 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,7 +30886,8 @@
+@@ -28454,7 +30978,8 @@
done
done
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28465,21 +30897,26 @@
+@@ -28464,21 +30989,26 @@
*-*-solaris*)
;;
*)
@@ -32497,7 +32944,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28487,7 +30924,7 @@
+@@ -28486,7 +31016,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
@@ -32506,7 +32953,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28496,7 +30933,7 @@
+@@ -28495,7 +31025,7 @@
esac
fi
cd ..
@@ -32515,7 +32962,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28540,12 +30977,12 @@
+@@ -28539,12 +31069,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -32532,7 +32979,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28573,8 +31010,8 @@
+@@ -28572,8 +31102,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.
@@ -32543,7 +32990,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28587,40 +31024,52 @@
+@@ -28586,40 +31116,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32608,7 +33055,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28629,14 +31078,15 @@
+@@ -28628,14 +31170,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32617,7 +33064,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32628,7 +33075,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28645,8 +31095,8 @@
+@@ -28644,8 +31187,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -32639,7 +33086,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28680,24 +31130,36 @@
+@@ -28679,24 +31222,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32684,7 +33131,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28706,10 +31168,11 @@
+@@ -28705,10 +31260,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32694,11 +33141,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$kde_ldflags_safe
-@@ -28718,8 +31181,8 @@
+@@ -28717,8 +31273,8 @@
fi
@@ -32709,7 +33156,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28865,8 +31328,8 @@
+@@ -28864,8 +31420,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -32720,7 +33167,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28877,9 +31340,9 @@
+@@ -28876,9 +31432,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -32733,7 +33180,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28891,40 +31354,52 @@
+@@ -28890,40 +31446,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32798,7 +33245,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28933,14 +31408,16 @@
+@@ -28932,14 +31500,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32807,7 +33254,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32819,7 +33266,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28953,8 +31430,8 @@
+@@ -28952,8 +31522,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -32830,7 +33277,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28967,40 +31444,52 @@
+@@ -28966,40 +31536,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32895,7 +33342,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29009,14 +31498,15 @@
+@@ -29008,14 +31590,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32904,7 +33351,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32915,7 +33362,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29024,8 +31514,8 @@
+@@ -29023,8 +31606,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -32926,7 +33373,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29044,40 +31534,53 @@
+@@ -29043,40 +31626,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32989,11 +33436,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
fi
-@@ -29092,16 +31595,15 @@
+@@ -29091,16 +31687,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -33014,7 +33461,7 @@
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'
-@@ -29128,24 +31630,36 @@
+@@ -29127,24 +31722,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33059,7 +33506,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29154,8 +31668,10 @@
+@@ -29153,8 +31760,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33067,11 +33514,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29168,13 +31684,13 @@
+@@ -29167,13 +31776,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33089,7 +33536,7 @@
:
fi
-@@ -29186,16 +31702,15 @@
+@@ -29185,16 +31794,15 @@
case $host_os in
solaris*)
@@ -33110,7 +33557,7 @@
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'
-@@ -29222,24 +31737,36 @@
+@@ -29221,24 +31829,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33155,7 +33602,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29248,8 +31775,10 @@
+@@ -29247,8 +31867,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33163,11 +33610,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29262,13 +31791,13 @@
+@@ -29261,13 +31883,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33185,7 +33632,7 @@
:
fi
-@@ -29295,17 +31824,17 @@
+@@ -29294,17 +31916,17 @@
@@ -33209,7 +33656,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29323,21 +31852,21 @@
+@@ -29322,21 +31944,21 @@
fi
@@ -33239,7 +33686,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29356,14 +31885,14 @@
+@@ -29355,14 +31977,14 @@
@@ -33258,7 +33705,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29397,24 +31926,36 @@
+@@ -29396,24 +32018,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33303,7 +33750,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29423,9 +31964,10 @@
+@@ -29422,9 +32056,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33312,11 +33759,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29438,8 +31980,8 @@
+@@ -29437,8 +32072,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -33327,7 +33774,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29459,8 +32001,8 @@
+@@ -29458,8 +32093,8 @@
@@ -33338,7 +33785,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29496,24 +32038,36 @@
+@@ -29495,24 +32130,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33383,7 +33830,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29522,10 +32076,11 @@
+@@ -29521,10 +32168,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33393,11 +33840,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29539,19 +32094,19 @@
+@@ -29538,19 +32186,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -33423,7 +33870,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29584,24 +32139,36 @@
+@@ -29583,24 +32231,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33468,7 +33915,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29610,9 +32177,10 @@
+@@ -29609,9 +32269,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33477,11 +33924,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29622,14 +32190,14 @@
+@@ -29621,14 +32282,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -33502,7 +33949,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29662,24 +32230,36 @@
+@@ -29661,24 +32322,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33547,7 +33994,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29688,9 +32268,10 @@
+@@ -29687,9 +32360,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33556,11 +34003,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29700,11 +32281,11 @@
+@@ -29699,11 +32373,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -33576,16 +34023,16 @@
LIBJPEG=
-@@ -29724,7 +32305,7 @@
+@@ -29723,7 +32397,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29727: $i/$j" >&5
-+ echo "configure: 32308: $i/$j" >&5
+- echo "configure: 29726: $i/$j" >&5
++ echo "configure: 32400: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29771,14 +32352,14 @@
+@@ -29770,14 +32444,14 @@
@@ -33603,7 +34050,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29821,8 +32402,8 @@
+@@ -29820,8 +32494,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33614,7 +34061,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29831,8 +32412,8 @@
+@@ -29830,8 +32504,8 @@
{ (exit 1); exit 1; }; }
else
@@ -33625,7 +34072,7 @@
PERL=$kde_cv_path
fi
-@@ -29846,10 +32427,9 @@
+@@ -29845,10 +32519,9 @@
@@ -33638,7 +34085,7 @@
else
if test $kde_qtver = 3; then
-@@ -29859,7 +32439,8 @@
+@@ -29858,7 +32531,8 @@
fi
@@ -33648,7 +34095,7 @@
USING_QT_MT=""
-@@ -29879,13 +32460,13 @@
+@@ -29878,13 +32552,13 @@
else
kde_check_threading_default=yes
fi
@@ -33666,7 +34113,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29957,8 +32538,8 @@
+@@ -29956,8 +32630,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -33677,7 +34124,7 @@
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 +32548,34 @@
+@@ -29966,34 +32640,34 @@
qt_libraries=""
qt_includes=""
@@ -33724,16 +34171,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30022,7 +32603,7 @@
+@@ -30021,7 +32695,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 30025: $i/$j" >&5
-+ echo "configure: 32606: $i/$j" >&5
+- echo "configure: 30024: $i/$j" >&5
++ echo "configure: 32698: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30059,8 +32640,7 @@
+@@ -30058,8 +32732,7 @@
ac_qt_libraries="$qt_libdir"
@@ -33743,7 +34190,7 @@
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 +32777,13 @@
+@@ -30196,13 +32869,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -33761,7 +34208,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30212,15 +32792,14 @@
+@@ -30211,15 +32884,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -33780,7 +34227,7 @@
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 +32920,12 @@
+@@ -30340,12 +33012,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -33797,7 +34244,7 @@
fi
-@@ -30384,14 +32963,14 @@
+@@ -30383,14 +33055,14 @@
fi
@@ -33815,7 +34262,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30434,8 +33013,8 @@
+@@ -30433,8 +33105,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33826,7 +34273,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30456,22 +33035,22 @@
+@@ -30455,22 +33127,22 @@
{ (exit 1); exit 1; }; }
else
@@ -33854,7 +34301,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30514,12 +33093,12 @@
+@@ -30513,12 +33185,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33871,7 +34318,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30549,10 +33128,10 @@
+@@ -30548,10 +33220,10 @@
if test $kde_qtver = 3; then
@@ -33885,7 +34332,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30575,22 +33154,22 @@
+@@ -30574,22 +33246,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -33915,7 +34362,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30613,13 +33192,13 @@
+@@ -30612,13 +33284,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -33933,7 +34380,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30650,15 +33229,14 @@
+@@ -30649,15 +33321,14 @@
if test -n "$LIBJPEG"; then
@@ -33952,7 +34399,7 @@
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'
-@@ -30691,24 +33269,36 @@
+@@ -30690,24 +33361,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33997,7 +34444,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30717,9 +33307,10 @@
+@@ -30716,9 +33399,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34006,11 +34453,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30735,12 +33326,12 @@
+@@ -30734,12 +33418,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34027,7 +34474,7 @@
LIBJPEG_QT=
fi
-@@ -30771,15 +33362,15 @@
+@@ -30770,15 +33454,15 @@
@@ -34049,7 +34496,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30803,11 +33394,11 @@
+@@ -30802,11 +33486,11 @@
@@ -34065,34 +34512,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30859,7 +33450,7 @@
+@@ -30858,7 +33542,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30862: $i/$j" >&5
-+ echo "configure: 33453: $i/$j" >&5
+- echo "configure: 30861: $i/$j" >&5
++ echo "configure: 33545: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30889,7 +33480,7 @@
+@@ -30888,7 +33572,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30892: $i/$j" >&5
-+ echo "configure: 33483: $i/$j" >&5
+- echo "configure: 30891: $i/$j" >&5
++ echo "configure: 33575: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30907,7 +33498,7 @@
+@@ -30906,7 +33590,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30910: $i/$j" >&5
-+ echo "configure: 33501: $i/$j" >&5
+- echo "configure: 30909: $i/$j" >&5
++ echo "configure: 33593: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30966,12 +33557,12 @@
+@@ -30965,12 +33649,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34109,7 +34556,7 @@
fi
kde_libraries="${libdir}"
-@@ -30980,8 +33571,8 @@
+@@ -30979,8 +33663,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34120,7 +34567,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31019,8 +33610,8 @@
+@@ -31018,8 +33702,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -34131,7 +34578,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31063,8 +33654,8 @@
+@@ -31062,8 +33746,8 @@
fi
@@ -34142,7 +34589,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31096,10 +33687,9 @@
+@@ -31095,10 +33779,9 @@
@@ -34155,7 +34602,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31113,13 +33703,14 @@
+@@ -31112,13 +33795,14 @@
fi
@@ -34173,7 +34620,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31230,15 +33821,14 @@
+@@ -31229,15 +33913,14 @@
else
if test $kde_qtver = 1; then
@@ -34194,7 +34641,7 @@
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 +33880,8 @@
+@@ -31289,8 +33972,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34205,7 +34652,7 @@
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 +33920,8 @@
+@@ -31329,8 +34012,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34216,7 +34663,7 @@
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 +33929,8 @@
+@@ -31338,8 +34021,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34227,7 +34674,7 @@
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 +34123,14 @@
+@@ -31532,15 +34215,14 @@
else
if test $kde_qtver = 1; then
@@ -34248,7 +34695,7 @@
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 +34182,8 @@
+@@ -31592,8 +34274,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34259,7 +34706,7 @@
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 +34222,8 @@
+@@ -31632,8 +34314,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34270,7 +34717,7 @@
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 +34231,8 @@
+@@ -31641,8 +34323,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34281,7 +34728,7 @@
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 +34324,22 @@
+@@ -31734,22 +34416,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -34310,7 +34757,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31783,14 +34372,14 @@
+@@ -31782,14 +34464,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -34328,7 +34775,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31833,8 +34422,8 @@
+@@ -31832,8 +34514,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34339,7 +34786,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31845,21 +34434,21 @@
+@@ -31844,21 +34526,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34366,7 +34813,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31902,8 +34491,8 @@
+@@ -31901,8 +34583,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34377,7 +34824,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31914,22 +34503,22 @@
+@@ -31913,22 +34595,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34405,7 +34852,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31972,8 +34561,8 @@
+@@ -31971,8 +34653,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34416,7 +34863,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31986,21 +34575,21 @@
+@@ -31985,21 +34667,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34443,7 +34890,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32043,8 +34632,8 @@
+@@ -32042,8 +34724,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34454,7 +34901,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32057,22 +34646,22 @@
+@@ -32056,22 +34738,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34482,7 +34929,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32115,12 +34704,12 @@
+@@ -32114,12 +34796,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34499,7 +34946,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32149,14 +34738,14 @@
+@@ -32148,14 +34830,14 @@
if test -n "$kde32ornewer"; then
@@ -34517,7 +34964,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32199,8 +34788,8 @@
+@@ -32198,8 +34880,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34528,7 +34975,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32211,21 +34800,21 @@
+@@ -32210,21 +34892,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34555,7 +35002,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32268,8 +34857,8 @@
+@@ -32267,8 +34949,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34566,7 +35013,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32280,8 +34869,8 @@
+@@ -32279,8 +34961,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34577,7 +35024,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32289,14 +34878,14 @@
+@@ -32288,14 +34970,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -34595,7 +35042,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32339,8 +34928,8 @@
+@@ -32338,8 +35020,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34606,7 +35053,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32351,8 +34940,8 @@
+@@ -32350,8 +35032,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34617,7 +35064,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32360,14 +34949,14 @@
+@@ -32359,14 +35041,14 @@
fi
@@ -34635,7 +35082,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32410,12 +34999,12 @@
+@@ -32409,12 +35091,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34652,16 +35099,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32430,7 +35019,7 @@
+@@ -32429,7 +35111,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32433: $i/$j" >&5
-+ echo "configure: 35022: $i/$j" >&5
+- echo "configure: 32432: $i/$j" >&5
++ echo "configure: 35114: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32591,13 +35180,12 @@
+@@ -32590,13 +35272,12 @@
@@ -34678,7 +35125,7 @@
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 +35206,13 @@
+@@ -32617,13 +35298,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -34696,7 +35143,7 @@
{ 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 +35232,15 @@
+@@ -32643,16 +35324,15 @@
kde_have_gcc_visibility=no
@@ -34717,7 +35164,7 @@
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'
-@@ -32680,24 +35267,36 @@
+@@ -32679,24 +35359,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34762,7 +35209,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32706,8 +35305,10 @@
+@@ -32705,8 +35397,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34770,11 +35217,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -32720,28 +35321,27 @@
+@@ -32719,28 +35413,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34812,7 +35259,7 @@
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'
-@@ -32776,24 +35376,36 @@
+@@ -32775,24 +35468,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -34857,7 +35304,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32802,9 +35414,10 @@
+@@ -32801,9 +35506,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34870,7 +35317,7 @@
CXXFLAGS=$safe_CXXFLAGS
ac_ext=c
-@@ -32816,21 +35429,20 @@
+@@ -32815,21 +35521,20 @@
fi
@@ -34897,7 +35344,7 @@
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'
-@@ -32870,24 +35482,36 @@
+@@ -32869,24 +35574,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34942,7 +35389,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32896,9 +35520,10 @@
+@@ -32895,9 +35612,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34951,11 +35398,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -32912,8 +35537,8 @@
+@@ -32911,8 +35629,8 @@
fi
@@ -34966,7 +35413,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32929,8 +35554,8 @@
+@@ -32928,8 +35646,8 @@
fi
else
@@ -34977,7 +35424,7 @@
:
fi
-@@ -32938,8 +35563,8 @@
+@@ -32937,8 +35655,8 @@
fi
@@ -34988,16 +35435,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -32951,7 +35576,7 @@
+@@ -32950,7 +35668,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32954: $i/$j" >&5
-+ echo "configure: 35579: $i/$j" >&5
+- echo "configure: 32953: $i/$j" >&5
++ echo "configure: 35671: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -32960,20 +35585,20 @@
+@@ -32959,20 +35677,20 @@
done
done
@@ -35023,7 +35470,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33016,12 +35641,12 @@
+@@ -33015,12 +35733,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35040,7 +35487,7 @@
DOT=$kde_cv_path
fi
-@@ -33033,14 +35658,14 @@
+@@ -33032,14 +35750,14 @@
fi
@@ -35058,7 +35505,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33083,12 +35708,12 @@
+@@ -33082,12 +35800,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35075,7 +35522,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -33114,18 +35739,19 @@
+@@ -33113,18 +35831,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`
@@ -35103,7 +35550,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33136,24 +35762,36 @@
+@@ -33135,24 +35854,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35148,7 +35595,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33162,15 +35800,16 @@
+@@ -33161,15 +35892,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35171,7 +35618,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33179,8 +35818,13 @@
+@@ -33178,8 +35910,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35187,7 +35634,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33204,9 +35848,10 @@
+@@ -33203,9 +35940,10 @@
ac_header_preproc=no
fi
@@ -35200,7 +35647,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33230,25 +35875,19 @@
+@@ -33229,25 +35967,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;}
@@ -35233,7 +35680,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33265,18 +35904,19 @@
+@@ -33264,18 +35996,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`
@@ -35261,7 +35708,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33287,24 +35927,36 @@
+@@ -33286,24 +36019,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35306,7 +35753,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33313,15 +35965,16 @@
+@@ -33312,15 +36057,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35329,7 +35776,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33330,8 +35983,13 @@
+@@ -33329,8 +36075,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35345,7 +35792,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33355,9 +36013,10 @@
+@@ -33354,9 +36105,10 @@
ac_header_preproc=no
fi
@@ -35358,7 +35805,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33381,25 +36040,19 @@
+@@ -33380,25 +36132,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;}
@@ -35391,7 +35838,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33415,18 +36068,19 @@
+@@ -33414,18 +36160,19 @@
for ac_header in asm/param.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35419,7 +35866,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33437,24 +36091,36 @@
+@@ -33436,24 +36183,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35464,7 +35911,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33463,15 +36129,16 @@
+@@ -33462,15 +36221,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35487,7 +35934,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33480,8 +36147,13 @@
+@@ -33479,8 +36239,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35503,7 +35950,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33505,9 +36177,10 @@
+@@ -33504,9 +36269,10 @@
ac_header_preproc=no
fi
@@ -35516,7 +35963,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33531,25 +36204,19 @@
+@@ -33530,25 +36296,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;}
@@ -35549,7 +35996,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33569,18 +36236,19 @@
+@@ -33568,18 +36328,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`
@@ -35577,7 +36024,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33591,24 +36259,36 @@
+@@ -33590,24 +36351,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35622,7 +36069,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33617,15 +36297,16 @@
+@@ -33616,15 +36389,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35645,7 +36092,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33634,8 +36315,13 @@
+@@ -33633,8 +36407,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35661,7 +36108,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33659,9 +36345,10 @@
+@@ -33658,9 +36437,10 @@
ac_header_preproc=no
fi
@@ -35674,7 +36121,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33685,25 +36372,19 @@
+@@ -33684,25 +36464,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;}
@@ -35707,7 +36154,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33724,18 +36405,19 @@
+@@ -33723,18 +36497,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`
@@ -35735,7 +36182,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33746,24 +36428,36 @@
+@@ -33745,24 +36520,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35780,7 +36227,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33772,15 +36466,16 @@
+@@ -33771,15 +36558,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35803,7 +36250,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33789,8 +36484,13 @@
+@@ -33788,8 +36576,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35819,7 +36266,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33814,9 +36514,10 @@
+@@ -33813,9 +36606,10 @@
ac_header_preproc=no
fi
@@ -35832,7 +36279,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33840,25 +36541,19 @@
+@@ -33839,25 +36633,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;}
@@ -35865,7 +36312,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33877,18 +36572,19 @@
+@@ -33876,18 +36664,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`
@@ -35893,7 +36340,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33899,24 +36595,36 @@
+@@ -33898,24 +36687,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -35938,7 +36385,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33925,15 +36633,16 @@
+@@ -33924,15 +36725,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35961,7 +36408,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33942,8 +36651,13 @@
+@@ -33941,8 +36743,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -35977,7 +36424,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33967,9 +36681,10 @@
+@@ -33966,9 +36773,10 @@
ac_header_preproc=no
fi
@@ -35990,7 +36437,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33993,25 +36708,19 @@
+@@ -33992,25 +36800,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;}
@@ -36023,7 +36470,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34023,8 +36732,8 @@
+@@ -34022,8 +36824,8 @@
done
@@ -36034,7 +36481,7 @@
if test "${ac_cv_header_resolv_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34039,24 +36748,36 @@
+@@ -34038,24 +36840,36 @@
#include <resolv.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36079,7 +36526,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34065,25 +36786,26 @@
+@@ -34064,25 +36878,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36115,7 +36562,7 @@
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34091,8 +36813,8 @@
+@@ -34090,8 +36905,8 @@
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
@@ -36126,7 +36573,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34116,25 +36838,37 @@
+@@ -34115,25 +36930,37 @@
return 0;
}
_ACEOF
@@ -36173,7 +36620,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34143,28 +36877,42 @@
+@@ -34142,28 +36969,42 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36227,7 +36674,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34173,22 +36921,24 @@
+@@ -34172,22 +37013,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36257,7 +36704,7 @@
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34218,24 +36968,36 @@
+@@ -34217,24 +37060,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36302,7 +36749,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34244,8 +37006,10 @@
+@@ -34243,8 +37098,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36314,7 +36761,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34271,24 +37035,36 @@
+@@ -34270,24 +37127,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36359,7 +36806,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34297,13 +37073,15 @@
+@@ -34296,13 +37165,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36378,7 +36825,7 @@
if test "$ac_cv_sys_file_offset_bits" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -34312,8 +37090,8 @@
+@@ -34311,8 +37182,8 @@
fi
rm -f conftest*
@@ -36389,7 +36836,7 @@
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34343,24 +37121,36 @@
+@@ -34342,24 +37213,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36434,7 +36881,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34369,8 +37159,10 @@
+@@ -34368,8 +37251,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36446,7 +36893,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34396,24 +37188,36 @@
+@@ -34395,24 +37280,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36491,7 +36938,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34422,13 +37226,15 @@
+@@ -34421,13 +37318,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36510,7 +36957,7 @@
if test "$ac_cv_sys_large_files" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -34451,9 +37257,9 @@
+@@ -34450,9 +37349,9 @@
for ac_func in flock
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36523,7 +36970,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34479,53 +37285,59 @@
+@@ -34478,53 +37377,59 @@
#undef $ac_func
@@ -36602,7 +37049,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34534,13 +37346,15 @@
+@@ -34533,13 +37438,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36611,7 +37058,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -36622,7 +37069,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34551,15 +37365,14 @@
+@@ -34550,15 +37457,14 @@
@@ -36641,7 +37088,7 @@
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 +37384,6 @@
+@@ -34570,9 +37476,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36651,7 +37098,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34598,24 +37408,36 @@
+@@ -34597,24 +37500,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36696,7 +37143,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34624,9 +37446,10 @@
+@@ -34623,9 +37538,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36709,7 +37156,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -34639,11 +37462,11 @@
+@@ -34638,11 +37554,11 @@
fi
@@ -36725,7 +37172,7 @@
if test "${kde_cv_proto_usleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34664,8 +37487,7 @@
+@@ -34663,8 +37579,7 @@
if test "x$kde_cv_proto_usleep" = xunknown; then
@@ -36735,7 +37182,7 @@
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'
-@@ -34702,24 +37524,36 @@
+@@ -34701,24 +37616,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36780,7 +37227,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34729,10 +37563,11 @@
+@@ -34728,10 +37655,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36790,11 +37237,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -34745,8 +37580,8 @@
+@@ -34744,8 +37672,8 @@
fi
@@ -36805,7 +37252,7 @@
if test "x$kde_cv_func_usleep" = xyes; then
-@@ -34777,9 +37612,9 @@
+@@ -34776,9 +37704,9 @@
for ac_func in socket fabsl strdup vsnprintf tzset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36818,7 +37265,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -34805,53 +37640,59 @@
+@@ -34804,53 +37732,59 @@
#undef $ac_func
@@ -36897,7 +37344,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34860,13 +37701,15 @@
+@@ -34859,13 +37793,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36906,7 +37353,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -36917,7 +37364,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34877,15 +37720,14 @@
+@@ -34876,15 +37812,14 @@
@@ -36936,7 +37383,7 @@
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 +37739,6 @@
+@@ -34896,9 +37831,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36946,7 +37393,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34922,24 +37761,36 @@
+@@ -34921,24 +37853,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36991,7 +37438,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34948,9 +37799,10 @@
+@@ -34947,9 +37891,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37004,7 +37451,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -34963,11 +37815,11 @@
+@@ -34962,11 +37907,11 @@
fi
@@ -37020,7 +37467,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34988,8 +37840,7 @@
+@@ -34987,8 +37932,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -37030,7 +37477,7 @@
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'
-@@ -35024,24 +37875,36 @@
+@@ -35023,24 +37967,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37075,7 +37522,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35051,10 +37914,11 @@
+@@ -35050,10 +38006,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37085,11 +37532,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -35067,8 +37931,8 @@
+@@ -35066,8 +38023,8 @@
fi
@@ -37100,7 +37547,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -35092,15 +37956,14 @@
+@@ -35091,15 +38048,14 @@
@@ -37119,7 +37566,7 @@
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 +37975,6 @@
+@@ -35111,9 +38067,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37129,7 +37576,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35137,24 +37997,36 @@
+@@ -35136,24 +38089,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37174,7 +37621,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35163,9 +38035,10 @@
+@@ -35162,9 +38127,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37187,7 +37634,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -35178,11 +38051,11 @@
+@@ -35177,11 +38143,11 @@
fi
@@ -37203,7 +37650,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35203,8 +38076,7 @@
+@@ -35202,8 +38168,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -37213,7 +37660,7 @@
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'
-@@ -35239,24 +38111,36 @@
+@@ -35238,24 +38203,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37258,7 +37705,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35266,10 +38150,11 @@
+@@ -35265,10 +38242,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37268,11 +37715,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -35282,8 +38167,8 @@
+@@ -35281,8 +38259,8 @@
fi
@@ -37283,7 +37730,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -35307,15 +38192,14 @@
+@@ -35306,15 +38284,14 @@
@@ -37302,7 +37749,7 @@
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 +38211,6 @@
+@@ -35326,9 +38303,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37312,7 +37759,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35357,24 +38238,36 @@
+@@ -35356,24 +38330,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37357,7 +37804,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35383,9 +38276,10 @@
+@@ -35382,9 +38368,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37370,7 +37817,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -35398,11 +38292,11 @@
+@@ -35397,11 +38384,11 @@
fi
@@ -37386,7 +37833,7 @@
if test "${kde_cv_proto_getdomainname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35423,8 +38317,7 @@
+@@ -35422,8 +38409,7 @@
if test "x$kde_cv_proto_getdomainname" = xunknown; then
@@ -37396,7 +37843,7 @@
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'
-@@ -35465,24 +38358,36 @@
+@@ -35464,24 +38450,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37441,7 +37888,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35492,10 +38397,11 @@
+@@ -35491,10 +38489,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37451,11 +37898,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -35508,8 +38414,8 @@
+@@ -35507,8 +38506,8 @@
fi
@@ -37466,7 +37913,7 @@
if test "x$kde_cv_func_getdomainname" = xyes; then
-@@ -35533,15 +38439,14 @@
+@@ -35532,15 +38531,14 @@
@@ -37485,7 +37932,7 @@
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 +38458,6 @@
+@@ -35552,9 +38550,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37495,7 +37942,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35582,24 +38484,36 @@
+@@ -35581,24 +38576,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37540,7 +37987,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35608,9 +38522,10 @@
+@@ -35607,9 +38614,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37553,7 +38000,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -35623,11 +38538,11 @@
+@@ -35622,11 +38630,11 @@
fi
@@ -37569,7 +38016,7 @@
if test "${kde_cv_proto_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35648,8 +38563,7 @@
+@@ -35647,8 +38655,7 @@
if test "x$kde_cv_proto_gethostname" = xunknown; then
@@ -37579,7 +38026,7 @@
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'
-@@ -35688,24 +38602,36 @@
+@@ -35687,24 +38694,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37624,7 +38071,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35715,10 +38641,11 @@
+@@ -35714,10 +38733,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37634,11 +38081,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -35731,8 +38658,8 @@
+@@ -35730,8 +38750,8 @@
fi
@@ -37649,7 +38096,7 @@
if test "x$kde_cv_func_gethostname" = xyes; then
-@@ -35754,8 +38681,8 @@
+@@ -35753,8 +38773,8 @@
@@ -37660,7 +38107,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35781,24 +38708,36 @@
+@@ -35771,7 +38791,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+@@ -35780,24 +38801,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37705,7 +38162,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35824,24 +38763,36 @@
+@@ -35823,24 +38856,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37750,7 +38207,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35850,14 +38801,15 @@
+@@ -35849,14 +38894,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37769,7 +38226,7 @@
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 +38819,11 @@
+@@ -35866,11 +38912,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37785,7 +38242,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -35882,24 +38834,36 @@
+@@ -35881,24 +38927,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37830,7 +38287,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35918,8 +38882,10 @@
+@@ -35917,8 +38975,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37842,7 +38299,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -35927,27 +38893,41 @@
+@@ -35926,27 +38986,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37891,7 +38348,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35960,13 +38940,16 @@
+@@ -35959,13 +39033,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -37912,7 +38369,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -35985,8 +38968,8 @@
+@@ -35984,8 +39061,8 @@
esac
@@ -37923,7 +38380,7 @@
if test "${ac_cv_func_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36013,53 +38996,59 @@
+@@ -36012,53 +39089,59 @@
#undef res_init
@@ -37942,14 +38399,13 @@
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)
--choke me
++#if defined __stub_res_init || defined __stub___res_init
+ choke me
-#else
-char (*f) () = res_init;
-#endif
-#ifdef __cplusplus
-}
-+#if defined __stub_res_init || defined __stub___res_init
-+choke me
#endif
int
@@ -38003,7 +38459,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36068,17 +39057,18 @@
+@@ -36067,17 +39150,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38012,7 +38468,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
@@ -38028,7 +38484,7 @@
if test "${ac_cv_lib_resolv_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36091,40 +39081,52 @@
+@@ -36090,40 +39174,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38093,7 +38549,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36133,14 +39135,15 @@
+@@ -36132,14 +39228,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38102,7 +38558,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38113,7 +38569,7 @@
if test $ac_cv_lib_resolv_res_init = yes; then
LIBRESOLV="-lresolv $LIBSOCKET"
fi
-@@ -36148,8 +39151,8 @@
+@@ -36147,8 +39244,8 @@
fi
@@ -38124,7 +38580,7 @@
if test "${ac_cv_var_timezone+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36173,24 +39176,36 @@
+@@ -36172,24 +39269,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38169,7 +38625,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36199,12 +39214,13 @@
+@@ -36198,12 +39307,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38187,7 +38643,7 @@
if test $ac_cv_var_timezone = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36212,8 +39228,8 @@
+@@ -36211,8 +39321,8 @@
_ACEOF
fi
@@ -38198,7 +38654,7 @@
if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36238,24 +39254,36 @@
+@@ -36237,24 +39347,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38243,7 +38699,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36264,12 +39292,13 @@
+@@ -36263,12 +39385,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38261,7 +38717,7 @@
if test $ac_cv_struct_tm_gmtoff = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36279,16 +39308,16 @@
+@@ -36278,16 +39401,16 @@
fi
# check for SLP
@@ -38284,7 +38740,7 @@
save_slptest_LIBS="$LIBS"
save_slptest_LDFLAGS="$LDFLAGS"
save_slptest_CPPFLAGS="$CPPFLAGS"
-@@ -36315,24 +39344,36 @@
+@@ -36314,24 +39437,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38329,7 +38785,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36343,20 +39384,21 @@
+@@ -36342,20 +39477,21 @@
_ACEOF
LIB_SLP="-lslp"
@@ -38352,11 +38808,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CPPFLAGS=$save_slptest_CPPFLAGS
LDFLAGS=$save_slptest_LDFLAGS
-@@ -36376,13 +39418,13 @@
+@@ -36375,13 +39511,13 @@
else
kde_check_threading_default=yes
fi
@@ -38374,7 +38830,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -36407,28 +39449,27 @@
+@@ -36406,28 +39542,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -38410,7 +38866,7 @@
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'
-@@ -36464,24 +39505,36 @@
+@@ -36463,24 +39598,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38455,7 +38911,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36490,9 +39543,10 @@
+@@ -36489,9 +39636,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38464,11 +38920,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -36507,8 +39561,8 @@
+@@ -36506,8 +39654,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -38479,7 +38935,7 @@
GL_LDFLAGS=""
GLINC=""
-@@ -36528,8 +39582,8 @@
+@@ -36527,8 +39675,8 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -38490,7 +38946,7 @@
fi
fi
-@@ -36537,8 +39591,8 @@
+@@ -36536,8 +39684,8 @@
@@ -38501,16 +38957,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -36550,7 +39604,7 @@
+@@ -36549,7 +39697,7 @@
do
for j in qsql.html;
do
-- echo "configure: 36553: $i/$j" >&5
-+ echo "configure: 39607: $i/$j" >&5
+- echo "configure: 36552: $i/$j" >&5
++ echo "configure: 39700: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -36559,20 +39613,20 @@
+@@ -36558,20 +39706,20 @@
done
done
@@ -38536,7 +38992,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36615,12 +39669,12 @@
+@@ -36614,12 +39762,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38553,7 +39009,7 @@
DOT=$kde_cv_path
fi
-@@ -36632,14 +39686,14 @@
+@@ -36631,14 +39779,14 @@
fi
@@ -38571,7 +39027,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36682,12 +39736,12 @@
+@@ -36681,12 +39829,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38588,7 +39044,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -36706,8 +39760,8 @@
+@@ -36705,8 +39853,8 @@
@@ -38599,7 +39055,7 @@
if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36732,24 +39786,36 @@
+@@ -36731,24 +39879,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38644,7 +39100,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36758,12 +39824,13 @@
+@@ -36757,12 +39917,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38662,7 +39118,7 @@
if test $ac_cv_struct_tm_gmtoff = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36776,10 +39843,9 @@
+@@ -36775,10 +39936,9 @@
@@ -38674,7 +39130,7 @@
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 +39858,19 @@
+@@ -36791,18 +39951,19 @@
for ac_header in knotifydialog.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38702,7 +39158,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36814,24 +39881,36 @@
+@@ -36813,24 +39974,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -38747,7 +39203,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36840,15 +39919,16 @@
+@@ -36839,15 +40012,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38770,7 +39226,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36857,8 +39937,13 @@
+@@ -36856,8 +40030,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -38786,7 +39242,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -36882,9 +39967,10 @@
+@@ -36881,9 +40060,10 @@
ac_header_preproc=no
fi
@@ -38799,7 +39255,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36908,25 +39994,19 @@
+@@ -36907,25 +40087,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;}
@@ -38832,10 +39288,95 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36949,10 +40029,9 @@
+@@ -36948,11 +40122,10 @@
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'
+-echo "$as_me:$LINENO: checking for kdelibs newer than 3.3.x" >&5
+-echo $ECHO_N "checking for kdelibs newer than 3.3.x... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for kdelibs newer than 3.3.x" >&5
++echo $ECHO_N "checking for kdelibs newer than 3.3.x... $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'
+@@ -36988,42 +40161,55 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&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
+
+-KOPETE_COMPAT_INCLUDES='-I$(top_srcdir)/kopete/libkopete/compat'
++ KOPETE_COMPAT_INCLUDES='-I$(top_srcdir)/kopete/libkopete/compat'
+ KOPETE_INCLUDES=$KOPETE_INCLUDES' $(KOPETE_COMPAT_INCLUDES)'
+ LIB_KOPETECOMPAT='$(top_builddir)/kopete/libkopete/libkopete.la'
+- 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
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$kcompat_save_CXXFLAGS"
+ LIBS="$kcompat_safe_LIBS"
+ ac_ext=c
+@@ -37044,10 +40230,9 @@
+
+
+
-# Check whether --enable-smpppd or --disable-smpppd was given.
+# Check whether --enable-smpppd was given.
if test "${enable_smpppd+set}" = set; then
@@ -38845,7 +39386,7 @@
if test $enableval = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -36967,7 +40046,8 @@
+@@ -37062,7 +40247,8 @@
else
COMPILESMPPPDCS=
@@ -38855,7 +39396,7 @@
if test -n "$COMPILESMPPPDCS"; then
-@@ -36980,14 +40060,14 @@
+@@ -37075,14 +40261,14 @@
@@ -38873,7 +39414,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37030,15 +40110,15 @@
+@@ -37125,15 +40311,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38893,7 +39434,7 @@
XML_CONFIG=$kde_cv_path
fi
-@@ -37061,14 +40141,14 @@
+@@ -37156,14 +40342,14 @@
LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
@@ -38911,7 +39452,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37111,12 +40191,12 @@
+@@ -37206,12 +40392,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38928,7 +39469,7 @@
XMLLINT=$kde_cv_path
fi
-@@ -37135,14 +40215,14 @@
+@@ -37230,14 +40416,14 @@
@@ -38946,7 +39487,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37185,15 +40265,15 @@
+@@ -37280,15 +40466,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38966,7 +39507,7 @@
XSLT_CONFIG=$kde_cv_path
fi
-@@ -37250,8 +40330,8 @@
+@@ -37345,8 +40531,8 @@
# -- Check for installed Valgrind headers --------------------
@@ -38977,7 +39518,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -37273,24 +40353,36 @@
+@@ -37368,24 +40554,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39022,7 +39563,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37300,10 +40392,11 @@
+@@ -37395,10 +40593,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39036,7 +39577,7 @@
if test $ac_have_valgrind_h = yes; then
-@@ -37313,15 +40406,15 @@
+@@ -37408,15 +40607,15 @@
fi
@@ -39056,7 +39597,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37332,36 +40425,49 @@
+@@ -37427,36 +40626,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39116,7 +39657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37370,20 +40476,21 @@
+@@ -37465,23 +40677,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39134,22 +39675,29 @@
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_int" = yes; then
+- 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 +40503,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -37491,10 +40703,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39158,7 +39706,7 @@
test_array [0] = 0
;
-@@ -37407,24 +40515,36 @@
+@@ -37502,24 +40716,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39203,11 +39751,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37437,10 +40557,11 @@
+@@ -37532,10 +40758,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39216,7 +39765,7 @@
test_array [0] = 0
;
-@@ -37448,24 +40569,36 @@
+@@ -37543,24 +40771,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39261,7 +39810,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37474,30 +40607,32 @@
+@@ -37569,30 +40809,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39294,7 +39843,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39303,7 +39853,7 @@
test_array [0] = 0
;
-@@ -37505,24 +40640,36 @@
+@@ -37600,24 +40843,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39348,11 +39898,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37535,10 +40682,11 @@
+@@ -37630,10 +40885,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39361,7 +39912,7 @@
test_array [0] = 0
;
-@@ -37546,24 +40694,36 @@
+@@ -37641,24 +40898,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39406,7 +39957,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37572,24 +40732,27 @@
+@@ -37667,24 +40936,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39444,11 +39995,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -37600,10 +40763,11 @@
+@@ -37695,10 +40967,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39457,7 +40009,7 @@
test_array [0] = 0
;
-@@ -37611,24 +40775,36 @@
+@@ -37706,24 +40980,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39502,7 +40054,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37637,26 +40813,20 @@
+@@ -37732,26 +41018,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39516,13 +40068,17 @@
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)
++'') if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -39535,19 +40091,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37664,8 +40834,9 @@
+@@ -37759,8 +41043,10 @@
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_;
++ 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,35 +40845,44 @@
+@@ -37769,35 +41055,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -39605,12 +40162,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37713,28 +40893,27 @@
+@@ -37808,28 +41103,31 @@
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)
++if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
@@ -39619,18 +40177,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_int=0
+-else
+- ac_cv_sizeof_int=0
+-fi
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
@@ -39642,7 +40206,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37745,36 +40924,49 @@
+@@ -37840,36 +41138,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39702,7 +40266,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37783,20 +40975,21 @@
+@@ -37878,23 +41189,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39720,22 +40284,29 @@
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_short" = yes; then
+- 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 +41002,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -37904,10 +41215,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39744,7 +40315,7 @@
test_array [0] = 0
;
-@@ -37820,24 +41014,36 @@
+@@ -37915,24 +41228,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39789,11 +40360,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37850,10 +41056,11 @@
+@@ -37945,10 +41270,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39802,7 +40374,7 @@
test_array [0] = 0
;
-@@ -37861,24 +41068,36 @@
+@@ -37956,24 +41283,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39847,7 +40419,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37887,30 +41106,32 @@
+@@ -37982,30 +41321,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39880,7 +40452,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39889,7 +40462,7 @@
test_array [0] = 0
;
-@@ -37918,24 +41139,36 @@
+@@ -38013,24 +41355,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39934,11 +40507,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37948,10 +41181,11 @@
+@@ -38043,10 +41397,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39947,7 +40521,7 @@
test_array [0] = 0
;
-@@ -37959,24 +41193,36 @@
+@@ -38054,24 +41410,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39992,7 +40566,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37985,24 +41231,27 @@
+@@ -38080,24 +41448,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40030,11 +40604,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -38013,10 +41262,11 @@
+@@ -38108,10 +41479,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -40043,7 +40618,7 @@
test_array [0] = 0
;
-@@ -38024,24 +41274,36 @@
+@@ -38119,24 +41492,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40088,7 +40663,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38050,26 +41312,20 @@
+@@ -38145,26 +41530,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40102,13 +40677,17 @@
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)
++'') if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -40121,19 +40700,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38077,8 +41333,9 @@
+@@ -38172,8 +41555,10 @@
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_;
++ 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,35 +41344,44 @@
+@@ -38182,35 +41567,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -40191,12 +40771,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38126,28 +41392,27 @@
+@@ -38221,28 +41615,31 @@
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)
++if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
@@ -40205,18 +40786,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_short=0
+-else
+- ac_cv_sizeof_short=0
fi
- 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
@@ -40228,7 +40815,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38158,36 +41423,49 @@
+@@ -38253,36 +41650,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40288,7 +40875,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38196,20 +41474,21 @@
+@@ -38291,23 +41701,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40306,22 +40893,29 @@
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long" = yes; then
+- 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 +41501,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -38317,10 +41727,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -40330,7 +40924,7 @@
test_array [0] = 0
;
-@@ -38233,24 +41513,36 @@
+@@ -38328,24 +41740,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40375,11 +40969,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38263,10 +41555,11 @@
+@@ -38358,10 +41782,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -40388,7 +40983,7 @@
test_array [0] = 0
;
-@@ -38274,24 +41567,36 @@
+@@ -38369,24 +41795,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40433,7 +41028,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38300,30 +41605,32 @@
+@@ -38395,30 +41833,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40466,7 +41061,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -40475,7 +41071,7 @@
test_array [0] = 0
;
-@@ -38331,24 +41638,36 @@
+@@ -38426,24 +41867,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40520,11 +41116,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38361,10 +41680,11 @@
+@@ -38456,10 +41909,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -40533,7 +41130,7 @@
test_array [0] = 0
;
-@@ -38372,24 +41692,36 @@
+@@ -38467,24 +41922,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40578,7 +41175,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38398,24 +41730,27 @@
+@@ -38493,24 +41960,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40616,11 +41213,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -38426,10 +41761,11 @@
+@@ -38521,10 +41991,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -40629,7 +41227,7 @@
test_array [0] = 0
;
-@@ -38437,24 +41773,36 @@
+@@ -38532,24 +42004,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40674,7 +41272,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38463,26 +41811,20 @@
+@@ -38558,26 +42042,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40688,13 +41286,17 @@
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)
++'') if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -40707,19 +41309,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38490,8 +41832,9 @@
+@@ -38585,8 +42067,10 @@
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_;
++ 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,35 +41843,44 @@
+@@ -38595,35 +42079,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -40777,12 +41380,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38539,28 +41891,27 @@
+@@ -38634,28 +42127,31 @@
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)
++if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
@@ -40791,18 +41395,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_long=0
+-else
+- ac_cv_sizeof_long=0
+-fi
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
@@ -40814,7 +41424,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38571,36 +41922,49 @@
+@@ -38666,36 +42162,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40874,7 +41484,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38609,20 +41973,21 @@
+@@ -38704,23 +42213,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40892,22 +41502,29 @@
-echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_char_p" = yes; then
+- 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 +42000,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -38730,10 +42239,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -40916,7 +41533,7 @@
test_array [0] = 0
;
-@@ -38646,24 +42012,36 @@
+@@ -38741,24 +42252,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40961,11 +41578,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38676,10 +42054,11 @@
+@@ -38771,10 +42294,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -40974,7 +41592,7 @@
test_array [0] = 0
;
-@@ -38687,24 +42066,36 @@
+@@ -38782,24 +42307,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41019,7 +41637,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38713,30 +42104,32 @@
+@@ -38808,30 +42345,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41052,7 +41670,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -41061,7 +41680,7 @@
test_array [0] = 0
;
-@@ -38744,24 +42137,36 @@
+@@ -38839,24 +42379,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41106,11 +41725,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38774,10 +42179,11 @@
+@@ -38869,10 +42421,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -41119,7 +41739,7 @@
test_array [0] = 0
;
-@@ -38785,24 +42191,36 @@
+@@ -38880,24 +42434,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41164,7 +41784,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38811,24 +42229,27 @@
+@@ -38906,24 +42472,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41202,11 +41822,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -38839,10 +42260,11 @@
+@@ -38934,10 +42503,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -41215,7 +41836,7 @@
test_array [0] = 0
;
-@@ -38850,24 +42272,36 @@
+@@ -38945,24 +42516,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41260,7 +41881,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38876,26 +42310,20 @@
+@@ -38971,26 +42554,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41274,13 +41895,17 @@
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 *)
++'') if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -41293,19 +41918,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38903,8 +42331,9 @@
+@@ -38998,8 +42579,10 @@
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_;
++ 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,35 +42342,44 @@
+@@ -39008,35 +42591,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -41363,12 +41989,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38952,22 +42390,21 @@
+@@ -39047,22 +42639,25 @@
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 *)
++if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
@@ -41377,22 +42004,28 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_char_p=0
+-else
+- ac_cv_sizeof_char_p=0
fi
- 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 +42425,7 @@
+@@ -39083,8 +42678,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -41402,7 +42035,7 @@
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 +42435,17 @@
+@@ -39094,17 +42688,17 @@
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
@@ -41426,7 +42059,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39020,24 +42456,36 @@
+@@ -39115,24 +42709,36 @@
#include <X11/extensions/Xrender.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -41471,7 +42104,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39046,15 +42494,16 @@
+@@ -39141,15 +42747,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41494,7 +42127,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39063,8 +42512,13 @@
+@@ -39158,8 +42765,13 @@
/* end confdefs.h. */
#include <X11/extensions/Xrender.h>
_ACEOF
@@ -41510,7 +42143,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39088,9 +42542,10 @@
+@@ -39183,9 +42795,10 @@
ac_header_preproc=no
fi
@@ -41523,7 +42156,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -39114,25 +42569,18 @@
+@@ -39209,25 +42822,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;}
@@ -41554,7 +42187,7 @@
fi
if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-@@ -39160,8 +42608,8 @@
+@@ -39255,8 +42861,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -41565,7 +42198,7 @@
if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39174,40 +42622,52 @@
+@@ -39269,40 +42875,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41630,7 +42263,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39216,14 +42676,15 @@
+@@ -39311,14 +42929,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41639,7 +42272,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41650,7 +42283,7 @@
if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
LIB_XRENDER=-lXrender
-@@ -39246,18 +42707,19 @@
+@@ -39341,18 +42960,19 @@
for ac_header in tgmath.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -41678,7 +42311,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39268,24 +42730,36 @@
+@@ -39363,24 +42983,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -41723,7 +42356,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39294,15 +42768,16 @@
+@@ -39389,15 +43021,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41746,7 +42379,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39311,8 +42786,13 @@
+@@ -39406,8 +43039,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -41762,7 +42395,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39336,9 +42816,10 @@
+@@ -39431,9 +43069,10 @@
ac_header_preproc=no
fi
@@ -41775,7 +42408,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39362,25 +42843,19 @@
+@@ -39457,25 +43096,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;}
@@ -41808,7 +42441,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -39400,8 +42875,7 @@
+@@ -39495,8 +43128,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -41818,7 +42451,7 @@
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 +42884,8 @@
+@@ -39505,8 +43137,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -41829,7 +42462,7 @@
if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39428,24 +42902,36 @@
+@@ -39523,24 +43155,36 @@
#include <X11/extensions/scrnsaver.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -41874,7 +42507,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39454,16 +42940,17 @@
+@@ -39549,16 +43193,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41898,7 +42531,7 @@
if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39476,40 +42963,52 @@
+@@ -39571,40 +43216,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41963,7 +42596,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39518,14 +43017,15 @@
+@@ -39613,14 +43270,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41972,7 +42605,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41983,7 +42616,7 @@
if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
-@@ -39539,16 +43039,15 @@
+@@ -39634,16 +43292,15 @@
ld_shared_flag=
@@ -42004,7 +42637,7 @@
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'
-@@ -39575,24 +43074,36 @@
+@@ -39670,24 +43327,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42049,7 +42682,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39601,11 +43112,13 @@
+@@ -39696,11 +43365,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42057,7 +42690,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
- ac_ext=cc
@@ -42065,7 +42698,7 @@
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 +43128,19 @@
+@@ -39710,19 +43381,19 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -42091,7 +42724,7 @@
if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39640,40 +43153,52 @@
+@@ -39735,40 +43406,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42156,7 +42789,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39682,14 +43207,15 @@
+@@ -39777,14 +43460,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42165,7 +42798,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -42176,7 +42809,7 @@
if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
-@@ -39749,18 +43275,18 @@
+@@ -39844,18 +43528,18 @@
@@ -42201,7 +42834,7 @@
if test "${ac_cv_have_xmms+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39787,24 +43313,36 @@
+@@ -39882,24 +43566,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42246,7 +42879,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39813,10 +43351,11 @@
+@@ -39908,10 +43604,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42256,11 +42889,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_libs"
LDFLAGS="$ac_LDFLAGS_save"
-@@ -39824,8 +43363,8 @@
+@@ -39919,8 +43616,8 @@
fi
@@ -42271,7 +42904,7 @@
if test "$ac_cv_have_xmms" = "yes"; then
XMMS_INCLUDES="`xmms-config --cflags`"
-@@ -39865,31 +43404,31 @@
+@@ -39958,31 +43655,31 @@
ac_libgadu_libs=""
@@ -42315,7 +42948,7 @@
if test "$ac_libgadu_libs" != "" ; then
LIBGG_LIBS="-L$ac_libgadu_libs"
-@@ -39900,8 +43439,8 @@
+@@ -39993,8 +43690,8 @@
ac_save_CFLAGS="$CFLAGS"
LIBS="$LIBGG_LIBS -lgadu $LIBPTHREAD"
CFLAGS="$CFLAGS $LIBGG_INCLUDES"
@@ -42326,7 +42959,7 @@
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 +43463,20 @@
+@@ -40017,8 +43714,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -42349,7 +42982,7 @@
if ( maj != 1 ) {
return 1;
}
-@@ -39943,20 +43494,29 @@
+@@ -40036,20 +43745,29 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -42385,7 +43018,7 @@
COMPILE_GADU=true
use_libgadu_copy=
-@@ -39967,12 +43527,14 @@
+@@ -40060,12 +43778,14 @@
( exit $ac_status )
@@ -42403,7 +43036,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -39984,16 +43546,16 @@
+@@ -40077,16 +43797,16 @@
fi
if test -z "$COMPILE_GADU"; then
@@ -42426,8 +43059,17 @@
use_libgadu_copy=
COMPILE_GADU=
fi
-@@ -40034,15 +43596,14 @@
+@@ -40117,7 +43837,7 @@
+
+ if test "$use_libgadu_copy" = "yes"; then
+- ac_config_headers="$ac_config_headers kopete/protocols/gadu/libgadu/libgadu-config.h"
++ ac_config_headers="$ac_config_headers kopete/protocols/gadu/libgadu/libgadu-config.h"
+
+
+ if test "$ac_cv_c_bigendian" = "yes"; then
+@@ -40128,15 +43848,14 @@
+
fi
-echo "$as_me:$LINENO: checking for long long" >&5
@@ -42445,7 +43087,7 @@
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'
-@@ -40070,24 +43631,36 @@
+@@ -40164,24 +43883,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42490,7 +43132,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40096,9 +43669,10 @@
+@@ -40190,9 +43921,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42499,11 +43141,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -40109,8 +43683,8 @@
+@@ -40203,8 +43935,8 @@
fi
@@ -42514,7 +43156,7 @@
if test "$kde_cv_c_long_long" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -40134,26 +43708,26 @@
+@@ -40228,26 +43960,26 @@
ssl_libraries=""
ssl_includes=""
@@ -42551,16 +43193,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -40168,7 +43742,7 @@
+@@ -40262,7 +43994,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 40171: $i/$j" >&5
-+ echo "configure: 43745: $i/$j" >&5
+- echo "configure: 40265: $i/$j" >&5
++ echo "configure: 43997: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -40215,24 +43789,36 @@
+@@ -40309,24 +44041,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42605,7 +43247,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40242,10 +43828,11 @@
+@@ -40336,10 +44080,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42615,11 +43257,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$ac_ldflags_safe"
-@@ -40263,26 +43850,26 @@
+@@ -40357,26 +44102,26 @@
eval "$ac_cv_have_ssl"
@@ -42659,7 +43301,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40355,8 +43942,8 @@
+@@ -40449,8 +44194,8 @@
eval "$ac_cv_ssl_version"
@@ -42670,8 +43312,8 @@
fi
if test "$have_ssl" != yes; then
-@@ -40414,8 +44001,8 @@
- mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+@@ -40508,8 +44253,8 @@
+ _ACEOF
fi
- echo "$as_me:$LINENO: checking for C99-compatible vsnprintf()" >&5
@@ -42681,7 +43323,7 @@
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
-@@ -40439,19 +44026,28 @@
+@@ -40533,19 +44278,28 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -42714,9 +43356,9 @@
+ { 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 +44061,21 @@
+ cat >>confdefs.h <<_ACEOF
+ #define __GG_LIBGADU_HAVE_C99_VSNPRINTF 1
+@@ -40559,19 +44313,21 @@
( exit $ac_status )
@@ -42744,7 +43386,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40503,53 +44101,59 @@
+@@ -40597,53 +44353,59 @@
#undef $ac_func
@@ -42823,7 +43465,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40558,13 +44162,15 @@
+@@ -40652,13 +44414,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42832,7 +43474,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -42843,7 +43485,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -40581,9 +44187,9 @@
+@@ -40675,9 +44439,9 @@
for ac_func in _va_copy
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -42856,7 +43498,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -40609,53 +44215,59 @@
+@@ -40703,53 +44467,59 @@
#undef $ac_func
@@ -42935,7 +43577,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40664,13 +44276,15 @@
+@@ -40758,13 +44528,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42944,7 +43586,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -42955,60 +43597,463 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -40687,13 +44301,13 @@
+@@ -40792,8 +44564,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
+@@ -40808,28 +44580,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
--# 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
+ if test "$PKG_CONFIG" = "no" ; then
+@@ -40840,25 +44613,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 libidn" >&5
+-echo $ECHO_N "checking for libidn... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for libidn" >&5
++echo $ECHO_N "checking for libidn... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "libidn" ; 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 IDN_CFLAGS" >&5
+-echo $ECHO_N "checking IDN_CFLAGS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking IDN_CFLAGS" >&5
++echo $ECHO_N "checking IDN_CFLAGS... $ECHO_C" >&6; }
+ IDN_CFLAGS=`$PKG_CONFIG --cflags "libidn"`
+- echo "$as_me:$LINENO: result: $IDN_CFLAGS" >&5
+-echo "${ECHO_T}$IDN_CFLAGS" >&6
++ { echo "$as_me:$LINENO: result: $IDN_CFLAGS" >&5
++echo "${ECHO_T}$IDN_CFLAGS" >&6; }
+
+- echo "$as_me:$LINENO: checking IDN_LIBS" >&5
+-echo $ECHO_N "checking IDN_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking IDN_LIBS" >&5
++echo $ECHO_N "checking IDN_LIBS... $ECHO_C" >&6; }
+ IDN_LIBS=`$PKG_CONFIG --libs "libidn"`
+- echo "$as_me:$LINENO: result: $IDN_LIBS" >&5
+-echo "${ECHO_T}$IDN_LIBS" >&6
++ { echo "$as_me:$LINENO: result: $IDN_LIBS" >&5
++echo "${ECHO_T}$IDN_LIBS" >&6; }
+ else
+ IDN_CFLAGS=""
+ IDN_LIBS=""
+@@ -40896,10 +44669,10 @@
+
+
+
+-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: $have_libidn" >&5
+-echo "${ECHO_T}$have_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: $have_libidn" >&5
++echo "${ECHO_T}$have_libidn" >&6; }
+
+
+
+@@ -40919,11 +44692,11 @@
+
+
+ # Let the user disable the plugin
+-# 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;
+
+ if test "x$enable_meanwhile" != "xno"; then
+ # Check and setup for libmeanwhile
+@@ -40940,8 +44713,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
- libidn=yes
+@@ -40956,28 +44729,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
+@@ -40988,25 +44762,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 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 >= 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 >= 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: 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
++ { 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
+ MEANWHILE_CFLAGS=""
+ MEANWHILE_LIBS=""
+@@ -41034,25 +44808,25 @@
+
+ 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
+
+
+
+
+-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
+
+ # Set the flag to compile meanwhile
+@@ -41068,13 +44842,13 @@
+
+
+ # testbed protocol
+-# Check whether --enable-testbed or --disable-testbed was given.
++# Check whether --enable-testbed was given.
+ if test "${enable_testbed+set}" = set; then
+- enableval="$enable_testbed"
+- with_testbed=$enableval
++ enableval=$enable_testbed; with_testbed=$enableval
+ else
+ with_testbed=yes
-fi;
+fi
+
- if test "$libidn" != "no"; then
- if test "$libidn" != "yes"; then
-@@ -40706,8 +44320,7 @@
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
+ if test "$with_testbed" = "yes"; then
+@@ -41092,8 +44866,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
+@@ -41108,28 +44882,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
-
-- ac_ext=cc
-+ ac_ext=cpp
+ 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
+@@ -41140,25 +44915,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 gmodule-2.0" >&5
+-echo $ECHO_N "checking for glib-2.0 gmodule-2.0... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for glib-2.0 gmodule-2.0" >&5
++echo $ECHO_N "checking for glib-2.0 gmodule-2.0... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "glib-2.0 gmodule-2.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 gmodule-2.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 gmodule-2.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=""
+@@ -41203,10 +44978,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
+@@ -41225,16 +45000,16 @@
+
+
+ # Check for sms protocol
+-# Check whether --enable-smsgsm or --disable-smsgsm was given.
++# Check whether --enable-smsgsm was given.
+ if test "${enable_smsgsm+set}" = set; then
+- enableval="$enable_smsgsm"
+- compile_smsgsm=$enableval
++ enableval=$enable_smsgsm; compile_smsgsm=$enableval
+ else
+ compile_smsgsm=yes
+
+-fi;
++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'
-@@ -40717,17 +44330,17 @@
+@@ -41258,24 +45033,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41284,24 +45071,25 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-have_smsgsm_lib=no
++ have_smsgsm_lib=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_save_LIBS
- 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
+ if test "${ac_cv_header_gsmlib_gsm_util_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for gsmlib/gsm_util.h" >&5
+-echo $ECHO_N "checking for gsmlib/gsm_util.h... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for gsmlib/gsm_util.h" >&5
++echo $ECHO_N "checking for gsmlib/gsm_util.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_gsmlib_gsm_util_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; }
+-echo "$as_me:$LINENO: result: $ac_cv_header_gsmlib_gsm_util_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gsmlib_gsm_util_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_gsmlib_gsm_util_h" >&5
++echo "${ECHO_T}$ac_cv_header_gsmlib_gsm_util_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; }
+-echo "$as_me:$LINENO: checking gsmlib/gsm_util.h usability" >&5
+-echo $ECHO_N "checking gsmlib/gsm_util.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking gsmlib/gsm_util.h usability" >&5
++echo $ECHO_N "checking gsmlib/gsm_util.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40738,24 +44351,36 @@
- #include <idna.h>
+@@ -41312,24 +45100,36 @@
+ #include <gsmlib/gsm_util.h>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -43052,7 +44097,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40764,15 +44389,16 @@
+@@ -41338,15 +45138,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43068,16 +44113,16 @@
+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; }
+-echo "$as_me:$LINENO: checking gsmlib/gsm_util.h presence" >&5
+-echo $ECHO_N "checking gsmlib/gsm_util.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking gsmlib/gsm_util.h presence" >&5
++echo $ECHO_N "checking gsmlib/gsm_util.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40781,8 +44407,13 @@
+@@ -41355,8 +45156,13 @@
/* end confdefs.h. */
- #include <idna.h>
+ #include <gsmlib/gsm_util.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -43091,7 +44136,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40806,9 +44437,10 @@
+@@ -41380,9 +45186,10 @@
ac_header_preproc=no
fi
@@ -43104,10 +44149,10 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40832,25 +44464,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;}
+@@ -41406,25 +45213,18 @@
+ echo "$as_me: WARNING: gsmlib/gsm_util.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: gsmlib/gsm_util.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: gsmlib/gsm_util.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -43119,34 +44164,63 @@
+
;;
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 "$as_me:$LINENO: checking for gsmlib/gsm_util.h" >&5
+-echo $ECHO_N "checking for gsmlib/gsm_util.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for gsmlib/gsm_util.h" >&5
++echo $ECHO_N "checking for gsmlib/gsm_util.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_gsmlib_gsm_util_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_idna_h=$ac_header_preproc
+ ac_cv_header_gsmlib_gsm_util_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; }
+-echo "$as_me:$LINENO: result: $ac_cv_header_gsmlib_gsm_util_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gsmlib_gsm_util_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_gsmlib_gsm_util_h" >&5
++echo "${ECHO_T}$ac_cv_header_gsmlib_gsm_util_h" >&6; }
fi
- if test $ac_cv_header_idna_h = yes; then
-@@ -40879,8 +44504,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
+ if test $ac_cv_header_gsmlib_gsm_util_h = yes; then
+@@ -41446,10 +45246,10 @@
+
+
+ # Let the user know
+-echo "$as_me:$LINENO: checking if SMSGSM Plugin should be compiled" >&5
+-echo $ECHO_N "checking if SMSGSM Plugin should be compiled... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $compile_smsgsm" >&5
+-echo "${ECHO_T}$compile_smsgsm" >&6
++{ echo "$as_me:$LINENO: checking if SMSGSM Plugin should be compiled" >&5
++echo $ECHO_N "checking if SMSGSM Plugin should be compiled... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $compile_smsgsm" >&5
++echo "${ECHO_T}$compile_smsgsm" >&6; }
+
+ # Here we go
+
+@@ -41488,18 +45288,18 @@
+
+
+ # Check if the user want Jabber Jingle voice support
+-# Check whether --enable-jingle or --disable-jingle was given.
++# Check whether --enable-jingle was given.
+ if test "${enable_jingle+set}" = set; then
+- enableval="$enable_jingle"
+- with_jingle=$enableval
++ enableval=$enable_jingle; with_jingle=$enableval
+ else
+ with_jingle=no
+-fi;
++fi
++
+
+ # Here we go
+ HAVE_EXPAT=no
+-echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+-echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
++echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40893,40 +44518,52 @@
+@@ -41512,40 +45312,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43159,12 +44233,12 @@
#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 ();
+ char XML_ParserCreate ();
int
main ()
{
--stringprep_check_version ();
-+return stringprep_check_version ();
+-XML_ParserCreate ();
++return XML_ParserCreate ();
;
return 0;
}
@@ -43211,75 +44285,280 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40935,14 +44572,15 @@
+@@ -41554,14 +45366,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
+-ac_cv_lib_expat_XML_ParserCreate=no
++ ac_cv_lib_expat_XML_ParserCreate=no
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--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"
+-echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+-echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
++echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+ if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+ HAVE_EXPAT="yes"
+ fi
+@@ -41579,18 +45392,19 @@
+ for ac_header in alsa/asoundlib.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
-@@ -40965,10 +44603,10 @@
- echo "$as_me: WARNING: Libidn not found, Kopete Jabber plugin will not be compiled" >&2;}
+ # 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
+@@ -41601,24 +45415,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41627,15 +45453,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
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--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; }
+ # 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
+@@ -41644,8 +45471,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -41669,9 +45501,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
+@@ -41695,33 +45528,27 @@
+ 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; }
-@@ -40985,26 +44623,21 @@
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
++echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41734,40 +45561,52 @@
+ 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 snd_pcm_open ();
+ int
+ main ()
+ {
+-snd_pcm_open ();
++return snd_pcm_open ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -41776,14 +45615,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
-
--
--#
- # Sametime support
--#
-
- # lower and upper-bound versions of Meanwhile library
-
-
-
- # Let the user disable the plugin
--# Check whether --enable-sametime-plugin or --disable-sametime-plugin was given.
--if test "${enable_sametime_plugin+set}" = set; then
-- enableval="$enable_sametime_plugin"
-- compile_meanwhile=$enableval
--else
-- compile_meanwhile=no
-+# Check whether --enable-meanwhile was given.
-+if test "${enable_meanwhile+set}" = set; then
-+ enableval=$enable_meanwhile;
-+fi
-
--fi;
-
--# Check and setup for Meanwhile library
-+if test "x$enable_meanwhile" != "xno"; then
-+ # Check and setup for libmeanwhile
-
-
- PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
-@@ -41018,8 +44651,8 @@
+-ac_cv_lib_asound_snd_pcm_open=no
++ ac_cv_lib_asound_snd_pcm_open=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
++echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
+ if test $ac_cv_lib_asound_snd_pcm_open = yes; then
+ ALSA_LIBS="-lasound" ;
+ cat >>confdefs.h <<\_ACEOF
+@@ -41811,8 +45651,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
@@ -43290,7 +44569,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41034,28 +44667,29 @@
+@@ -41827,28 +45667,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -43326,84 +44605,63 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -41066,31 +44700,31 @@
+@@ -41859,25 +45700,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 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 ortp" >&5
+-echo $ECHO_N "checking for ortp... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for ortp" >&5
++echo $ECHO_N "checking for ortp... $ECHO_C" >&6; }
-- if $PKG_CONFIG --exists "meanwhile >= 0.4.2 meanwhile < 0.5.0" ; then
+ if $PKG_CONFIG --exists "ortp" ; 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; }
succeeded=yes
-- 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 >= 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: checking ORTP_CFLAGS" >&5
+-echo $ECHO_N "checking ORTP_CFLAGS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking ORTP_CFLAGS" >&5
++echo $ECHO_N "checking ORTP_CFLAGS... $ECHO_C" >&6; }
+ ORTP_CFLAGS=`$PKG_CONFIG --cflags "ortp"`
+- echo "$as_me:$LINENO: result: $ORTP_CFLAGS" >&5
+-echo "${ECHO_T}$ORTP_CFLAGS" >&6
++ { echo "$as_me:$LINENO: result: $ORTP_CFLAGS" >&5
++echo "${ECHO_T}$ORTP_CFLAGS" >&6; }
+
+- echo "$as_me:$LINENO: checking ORTP_LIBS" >&5
+-echo $ECHO_N "checking ORTP_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking ORTP_LIBS" >&5
++echo $ECHO_N "checking ORTP_LIBS... $ECHO_C" >&6; }
+ ORTP_LIBS=`$PKG_CONFIG --libs "ortp"`
+- echo "$as_me:$LINENO: result: $ORTP_LIBS" >&5
+-echo "${ECHO_T}$ORTP_LIBS" >&6
++ { echo "$as_me:$LINENO: result: $ORTP_LIBS" >&5
++echo "${ECHO_T}$ORTP_LIBS" >&6; }
else
- 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.
-- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "meanwhile >= 0.4.2 meanwhile < 0.5.0"`
-+ MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "meanwhile >= 1.0.1 meanwhile < 1.1.0"`
+ ORTP_CFLAGS=""
+ ORTP_LIBS=""
+@@ -41910,13 +45751,13 @@
- fi
-@@ -41103,14 +44737,24 @@
- fi
- if test $succeeded = yes; then
-- have_meanwhile=yes
-+ have_libmeanwhile=yes
- else
-- have_meanwhile=no
--
-+ have_libmeanwhile=no
- fi
-
-
-
-+ if test "x$have_libmeanwhile" = "xno"; then
-+ enable_meanwhile=no
-+ { 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; }
-+ fi
+-# Check whether --with-speex or --without-speex was given.
++# Check whether --with-speex was given.
+ if test "${with_speex+set}" = set; then
+- withval="$with_speex"
+- speex_prefix=${withval}
++ withval=$with_speex; speex_prefix=${withval}
+ else
+ speex_prefix="/usr"
+-fi;
+fi
+
-+
- # Check and setup for GLib library
-@@ -41127,8 +44771,8 @@
+ succeeded=no
+@@ -41924,8 +45765,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
@@ -43414,7 +44672,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41143,28 +44787,29 @@
+@@ -41940,28 +45781,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -43450,115 +44708,551 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -41175,25 +44820,25 @@
+@@ -41972,25 +45814,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; }
+- echo "$as_me:$LINENO: checking for speex" >&5
+-echo $ECHO_N "checking for speex... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for speex" >&5
++echo $ECHO_N "checking for speex... $ECHO_C" >&6; }
- if $PKG_CONFIG --exists "glib-2.0 >= 2.0.0" ; then
+ if $PKG_CONFIG --exists "speex" ; 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 SPEEX_CFLAGS" >&5
+-echo $ECHO_N "checking SPEEX_CFLAGS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking SPEEX_CFLAGS" >&5
++echo $ECHO_N "checking SPEEX_CFLAGS... $ECHO_C" >&6; }
+ SPEEX_CFLAGS=`$PKG_CONFIG --cflags "speex"`
+- echo "$as_me:$LINENO: result: $SPEEX_CFLAGS" >&5
+-echo "${ECHO_T}$SPEEX_CFLAGS" >&6
++ { echo "$as_me:$LINENO: result: $SPEEX_CFLAGS" >&5
++echo "${ECHO_T}$SPEEX_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; }
+- echo "$as_me:$LINENO: checking SPEEX_LIBS" >&5
+-echo $ECHO_N "checking SPEEX_LIBS... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking SPEEX_LIBS" >&5
++echo $ECHO_N "checking SPEEX_LIBS... $ECHO_C" >&6; }
+ SPEEX_LIBS=`$PKG_CONFIG --libs "speex"`
+- echo "$as_me:$LINENO: result: $SPEEX_LIBS" >&5
+-echo "${ECHO_T}$SPEEX_LIBS" >&6
++ { echo "$as_me:$LINENO: result: $SPEEX_LIBS" >&5
++echo "${ECHO_T}$SPEEX_LIBS" >&6; }
else
- GLIB_CFLAGS=""
- GLIB_LIBS=""
-@@ -41222,21 +44867,20 @@
+ SPEEX_CFLAGS=""
+ SPEEX_LIBS=""
+@@ -42018,18 +45860,19 @@
+ for ac_header in speex.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
+@@ -42040,24 +45883,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42066,15 +45921,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
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ # 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
+@@ -42083,8 +45939,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -42108,9 +45969,10 @@
--# 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; }
-+if test "x$enable_meanwhile" != "xno"; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
+ 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; }
--# Let the user know
--echo "$as_me:$LINENO: checking if Sametime Plugin should be compiled" >&5
--echo $ECHO_N "checking if Sametime Plugin should be compiled... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $compile_meanwhile" >&5
--echo "${ECHO_T}$compile_meanwhile" >&6
-+# Set the flag to compile meanwhile
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -42134,33 +45996,27 @@
+ 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; }
--# Here we go
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- echo "$as_me:$LINENO: checking for speex_encode_int in -lspeex" >&5
+-echo $ECHO_N "checking for speex_encode_int in -lspeex... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for speex_encode_int in -lspeex" >&5
++echo $ECHO_N "checking for speex_encode_int in -lspeex... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_speex_speex_encode_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42173,40 +46029,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
--
--if test "x$compile_meanwhile" = "xyes"; then
-+if test "x$enable_meanwhile" != "xno"; then
- include_meanwhile_TRUE=
- include_meanwhile_FALSE='#'
+-/* 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 speex_encode_int ();
+ int
+ main ()
+ {
+-speex_encode_int ();
++return speex_encode_int ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42215,14 +46083,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_speex_speex_encode_int=no
++ ac_cv_lib_speex_speex_encode_int=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encode_int" >&5
+-echo "${ECHO_T}$ac_cv_lib_speex_speex_encode_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encode_int" >&5
++echo "${ECHO_T}$ac_cv_lib_speex_speex_encode_int" >&6; }
+ if test $ac_cv_lib_speex_speex_encode_int = yes; then
+ speex_found=yes
else
-@@ -41245,18 +44889,14 @@
+@@ -42239,18 +46108,19 @@
+ for ac_header in speex/speex.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
+@@ -42261,24 +46131,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42287,15 +46169,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
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
--#
--# End of Sametime support
--#
--
- # testbed protocol
--# Check whether --enable-testbed or --disable-testbed was given.
-+# Check whether --enable-testbed was given.
- if test "${enable_testbed+set}" = set; then
-- enableval="$enable_testbed"
-- with_testbed=$enableval
-+ enableval=$enable_testbed; with_testbed=$enableval
- else
- with_testbed=yes
--fi;
-+fi
+ # 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
+@@ -42304,8 +46187,13 @@
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+@@ -42329,9 +46217,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
+@@ -42355,33 +46244,27 @@
+ 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; }
- if test "$with_testbed" = "yes"; then
-@@ -41276,10 +44916,10 @@
- msn_webcam_val=1
fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- echo "$as_me:$LINENO: checking for speex_encode_int in -lspeex" >&5
+-echo $ECHO_N "checking for speex_encode_int in -lspeex... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for speex_encode_int in -lspeex" >&5
++echo $ECHO_N "checking for speex_encode_int in -lspeex... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_speex_speex_encode_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42394,40 +46277,52 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
--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; }
+-/* 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 speex_encode_int ();
+ int
+ main ()
+ {
+-speex_encode_int ();
++return speex_encode_int ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+@@ -42436,14 +46331,15 @@
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
- cat >>confdefs.h <<_ACEOF
- #define MSN_WEBCAM $msn_webcam_val
-@@ -41301,8 +44941,8 @@
+-ac_cv_lib_speex_speex_encode_int=no
++ ac_cv_lib_speex_speex_encode_int=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encode_int" >&5
+-echo "${ECHO_T}$ac_cv_lib_speex_speex_encode_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encode_int" >&5
++echo "${ECHO_T}$ac_cv_lib_speex_speex_encode_int" >&6; }
+ if test $ac_cv_lib_speex_speex_encode_int = yes; then
+ speex_found=yes
+ else
+@@ -42521,8 +46417,8 @@
# Checks for typedefs, structures, and compiler characteristics.
@@ -43569,7 +45263,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41328,24 +44968,36 @@
+@@ -42539,7 +46435,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+@@ -42548,24 +46445,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43614,7 +45318,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41371,24 +45023,36 @@
+@@ -42591,24 +46500,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43659,7 +45363,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41397,14 +45061,15 @@
+@@ -42617,14 +46538,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43678,7 +45382,7 @@
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 +45079,11 @@
+@@ -42634,11 +46556,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43694,7 +45398,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -41429,24 +45094,36 @@
+@@ -42649,24 +46571,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43739,7 +45443,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41465,8 +45142,10 @@
+@@ -42685,8 +46619,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43751,7 +45455,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -41474,27 +45153,41 @@
+@@ -42694,27 +46630,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43800,7 +45504,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41507,13 +45200,16 @@
+@@ -42727,13 +46677,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -43821,7 +45525,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -41531,8 +45227,8 @@
+@@ -42751,8 +46704,8 @@
{ (exit 1); exit 1; }; } ;;
esac
@@ -43832,7 +45536,35 @@
if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41572,6 +45268,7 @@
+@@ -42770,10 +46723,10 @@
+ #ifndef __cplusplus
+ /* Ultrix mips cc rejects this. */
+ typedef int charset[2];
+- const charset x;
++ const charset cs;
+ /* SunOS 4.1.1 cc rejects this. */
+- char const *const *ccp;
+- char **p;
++ char const *const *pcpcc;
++ char **ppc;
+ /* NEC SVR4.0.2 mips cc rejects this. */
+ struct point {int x, y;};
+ static struct point const zero = {0,0};
+@@ -42782,16 +46735,17 @@
+ an arm of an if-expression whose if-part is not a constant
+ expression */
+ const char *g = "string";
+- ccp = &g + (g ? g-g : 0);
++ pcpcc = &g + (g ? g-g : 0);
+ /* HPUX 7.0 cc rejects these. */
+- ++ccp;
+- p = (char**) ccp;
+- ccp = (char const *const *) p;
++ ++pcpcc;
++ ppc = (char**) pcpcc;
++ pcpcc = (char const *const *) ppc;
+ { /* SCO 3.2v4 cc rejects this. */
+ char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -43840,17 +45572,17 @@
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
-@@ -41590,7 +45287,9 @@
+@@ -42810,7 +46764,9 @@
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
+ if (!foo) return 0;
}
-+ return !x[0] && !zero.x;
++ return !cs[0] && !zero.x;
#endif
;
-@@ -41598,24 +45297,36 @@
+@@ -42818,24 +46774,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43895,7 +45627,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41624,12 +45335,13 @@
+@@ -42844,12 +46812,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43913,7 +45645,7 @@
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -41638,8 +45350,8 @@
+@@ -42858,8 +46827,8 @@
fi
@@ -43924,7 +45656,7 @@
if test "${ac_cv_c_inline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41659,39 +45371,54 @@
+@@ -42879,39 +46848,54 @@
_ACEOF
rm -f conftest.$ac_objext
@@ -43991,7 +45723,7 @@
case $ac_cv_c_inline in
-@@ -41709,8 +45436,8 @@
+@@ -42929,8 +46913,8 @@
;;
esac
@@ -44002,7 +45734,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41721,36 +45448,49 @@
+@@ -42941,36 +46925,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44062,7 +45794,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41759,24 +45499,25 @@
+@@ -42979,24 +46976,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44095,7 +45827,7 @@
if test "${ac_cv_struct_tm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41798,24 +45539,36 @@
+@@ -43018,24 +47016,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -44140,7 +45872,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41824,12 +45577,13 @@
+@@ -43044,12 +47054,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44158,7 +45890,7 @@
if test $ac_cv_struct_tm = sys/time.h; then
cat >>confdefs.h <<\_ACEOF
-@@ -41839,8 +45593,8 @@
+@@ -43059,8 +47070,8 @@
fi
@@ -44169,7 +45901,7 @@
if test "${ac_cv_type_uint8_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41851,36 +45605,49 @@
+@@ -43071,36 +47082,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44229,7 +45961,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41889,12 +45656,13 @@
+@@ -43109,12 +47133,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44247,7 +45979,7 @@
if test $ac_cv_type_uint8_t = yes; then
:
else
-@@ -41905,8 +45673,8 @@
+@@ -43125,8 +47150,8 @@
fi
@@ -44258,7 +45990,7 @@
if test "${ac_cv_type_uint32_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41917,36 +45685,49 @@
+@@ -43137,36 +47162,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44318,7 +46050,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41955,12 +45736,13 @@
+@@ -43175,12 +47213,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44336,7 +46068,7 @@
if test $ac_cv_type_uint32_t = yes; then
:
else
-@@ -41971,8 +45753,8 @@
+@@ -43191,8 +47230,8 @@
fi
@@ -44347,7 +46079,7 @@
if test "${ac_cv_type_uint64_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41983,36 +45765,49 @@
+@@ -43203,36 +47242,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -44407,7 +46139,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42021,12 +45816,13 @@
+@@ -43241,12 +47293,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44425,7 +46157,7 @@
if test $ac_cv_type_uint64_t = yes; then
:
else
-@@ -42042,9 +45838,9 @@
+@@ -43262,9 +47315,9 @@
for ac_func in strerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -44438,7 +46170,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -42070,53 +45866,59 @@
+@@ -43290,53 +47343,59 @@
#undef $ac_func
@@ -44517,7 +46249,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42125,13 +45927,15 @@
+@@ -43345,13 +47404,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44526,7 +46258,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -44537,7 +46269,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -42144,11 +45948,11 @@
+@@ -43364,11 +47425,11 @@
# Checks for library functions.
@@ -44552,10 +46284,10 @@
if test "$with_struct_callbacks" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -42172,14 +45976,13 @@
- YAHOOPKGREQ=""
+@@ -43393,14 +47454,13 @@
+
-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
@@ -44570,7 +46302,7 @@
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'
-@@ -42238,39 +46041,52 @@
+@@ -43459,39 +47519,52 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44633,11 +46365,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -42283,18 +46099,19 @@
+@@ -43504,18 +47577,19 @@
for ac_header in sys/param.h string.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -44665,7 +46397,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42305,24 +46122,36 @@
+@@ -43526,24 +47600,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -44710,7 +46442,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42331,15 +46160,16 @@
+@@ -43552,15 +47638,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44733,7 +46465,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42348,8 +46178,13 @@
+@@ -43569,8 +47656,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -44749,7 +46481,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -42373,9 +46208,10 @@
+@@ -43594,9 +47686,10 @@
ac_header_preproc=no
fi
@@ -44762,7 +46494,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -42399,25 +46235,19 @@
+@@ -43620,25 +47713,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;}
@@ -44795,7 +46527,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -42434,8 +46264,7 @@
+@@ -43655,8 +47742,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -44805,7 +46537,7 @@
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 +46273,8 @@
+@@ -43665,8 +47751,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -44816,7 +46548,7 @@
if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42462,24 +46291,36 @@
+@@ -43683,24 +47769,36 @@
#include <X11/extensions/xf86vmode.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44861,7 +46593,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42488,12 +46329,13 @@
+@@ -43709,12 +47807,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44879,7 +46611,7 @@
if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then
-@@ -42524,26 +46366,26 @@
+@@ -43745,26 +47844,26 @@
ssl_libraries=""
ssl_includes=""
@@ -44916,16 +46648,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -42558,7 +46400,7 @@
+@@ -43779,7 +47878,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 42561: $i/$j" >&5
-+ echo "configure: 46403: $i/$j" >&5
+- echo "configure: 43782: $i/$j" >&5
++ echo "configure: 47881: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42605,24 +46447,36 @@
+@@ -43826,24 +47925,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44970,7 +46702,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42632,10 +46486,11 @@
+@@ -43853,10 +47964,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44980,11 +46712,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$ac_ldflags_safe"
-@@ -42653,26 +46508,26 @@
+@@ -43874,26 +47986,26 @@
eval "$ac_cv_have_ssl"
@@ -45024,7 +46756,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42745,8 +46600,8 @@
+@@ -43966,8 +48078,8 @@
eval "$ac_cv_ssl_version"
@@ -45035,7 +46767,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -42806,8 +46661,7 @@
+@@ -44027,8 +48139,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -45045,7 +46777,7 @@
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 +46671,17 @@
+@@ -44038,17 +48149,17 @@
if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
@@ -45069,7 +46801,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42838,24 +46692,36 @@
+@@ -44059,24 +48170,36 @@
#include <X11/extensions/XTest.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -45114,7 +46846,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42864,15 +46730,16 @@
+@@ -44085,15 +48208,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45137,7 +46869,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42881,8 +46748,13 @@
+@@ -44102,8 +48226,13 @@
/* end confdefs.h. */
#include <X11/extensions/XTest.h>
_ACEOF
@@ -45153,7 +46885,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -42906,9 +46778,10 @@
+@@ -44127,9 +48256,10 @@
ac_header_preproc=no
fi
@@ -45166,7 +46898,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -42932,25 +46805,18 @@
+@@ -44153,25 +48283,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;}
@@ -45197,7 +46929,7 @@
fi
if test $ac_cv_header_X11_extensions_XTest_h = yes; then
-@@ -42972,8 +46838,8 @@
+@@ -44193,8 +48316,8 @@
#check for getifaddrs(3) (as in glibc >= 2.3 and newer bsds)
@@ -45208,7 +46940,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42996,24 +46862,36 @@
+@@ -44217,24 +48340,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45253,7 +46985,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43023,8 +46901,8 @@
+@@ -44244,8 +48379,8 @@
#define HAVE_GETIFADDRS 1
_ACEOF
@@ -45264,7 +46996,7 @@
COMPILE_GETIFADDRS=""
else
-@@ -43032,12 +46910,13 @@
+@@ -44253,12 +48388,13 @@
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45277,11 +47009,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-@@ -43047,8 +46926,8 @@
+@@ -44268,8 +48404,8 @@
@@ -45292,7 +47024,7 @@
if test -n "`echo $target_os | grep linux`" ; then
if test -d /proc; then
-@@ -43072,15 +46951,15 @@
+@@ -44293,15 +48429,15 @@
_ACEOF
@@ -45314,7 +47046,7 @@
fi
-@@ -43099,8 +46978,8 @@
+@@ -44320,8 +48456,8 @@
@@ -45325,7 +47057,7 @@
if test "${kde_cv_utmp_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -43131,12 +47010,12 @@
+@@ -44352,12 +48488,12 @@
_ACEOF
@@ -45342,7 +47074,7 @@
fi
-@@ -43146,8 +47025,8 @@
+@@ -44367,8 +48503,8 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -45353,7 +47085,7 @@
if test "${ac_cv_lib_bsd_bsd_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43160,40 +47039,52 @@
+@@ -44381,40 +48517,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45418,7 +47150,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43202,14 +47093,15 @@
+@@ -44423,14 +48571,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45427,7 +47159,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -45438,7 +47170,7 @@
if test $ac_cv_lib_bsd_bsd_ioctl = yes; then
LIBBSD="-lbsd"
fi
-@@ -43221,18 +47113,19 @@
+@@ -44442,18 +48591,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`
@@ -45466,7 +47198,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43243,24 +47136,36 @@
+@@ -44464,24 +48614,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -45511,7 +47243,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43269,15 +47174,16 @@
+@@ -44490,15 +48652,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45534,7 +47266,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43286,8 +47192,13 @@
+@@ -44507,8 +48670,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -45550,7 +47282,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -43311,9 +47222,10 @@
+@@ -44532,9 +48700,10 @@
ac_header_preproc=no
fi
@@ -45563,7 +47295,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43337,25 +47249,19 @@
+@@ -44558,25 +48727,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;}
@@ -45596,7 +47328,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43368,8 +47274,8 @@
+@@ -44589,8 +48752,8 @@
done
@@ -45607,7 +47339,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43393,24 +47299,36 @@
+@@ -44614,24 +48777,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45652,7 +47384,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43419,12 +47337,13 @@
+@@ -44640,12 +48815,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45670,7 +47402,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -43434,7 +47353,7 @@
+@@ -44655,7 +48831,7 @@
fi
@@ -45679,7 +47411,7 @@
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 +47367,8 @@
+@@ -44669,8 +48845,8 @@
if test "$GCC" = "yes"; then
CXXFLAGS="$CXXFLAGS -pedantic-errors"
fi
@@ -45690,7 +47422,7 @@
if test "${ac_cv_scandir_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43476,24 +47395,36 @@
+@@ -44697,24 +48873,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45735,7 +47467,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43502,14 +47433,15 @@
+@@ -44723,14 +48911,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45755,7 +47487,7 @@
if eval "test \"`echo $ac_cv_scandir_const`\" = yes"; then
-@@ -43525,9 +47457,9 @@
+@@ -44746,9 +48935,9 @@
for ac_func in getifaddrs getnameinfo
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -45768,7 +47500,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -43553,53 +47485,59 @@
+@@ -44774,53 +48963,59 @@
#undef $ac_func
@@ -45847,7 +47579,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43608,13 +47546,15 @@
+@@ -44829,13 +49024,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45856,7 +47588,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -45867,7 +47599,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -43623,8 +47563,8 @@
+@@ -44844,8 +49041,8 @@
fi
done
@@ -45878,7 +47610,7 @@
if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43649,24 +47589,36 @@
+@@ -44870,24 +49067,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45923,7 +47655,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43675,7 +47627,7 @@
+@@ -44896,7 +49105,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45932,7 +47664,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -43696,24 +47648,36 @@
+@@ -44917,24 +49126,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45977,7 +47709,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43722,14 +47686,16 @@
+@@ -44943,14 +49164,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45999,7 +47731,7 @@
if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -43741,19 +47707,18 @@
+@@ -44962,19 +49185,18 @@
@@ -46024,7 +47756,7 @@
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 +47727,8 @@
+@@ -44983,8 +49205,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -46035,7 +47767,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43785,44 +47750,57 @@
+@@ -45006,44 +49228,57 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46109,7 +47841,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43848,44 +47826,56 @@
+@@ -45069,44 +49304,56 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46180,7 +47912,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43909,29 +47899,41 @@
+@@ -45130,29 +49377,41 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46232,7 +47964,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_IW_27pre19 1
-@@ -43943,17 +47945,19 @@
+@@ -45164,17 +49423,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46257,7 +47989,7 @@
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 +47995,8 @@
+@@ -45212,8 +49473,8 @@
fi
for i in $ac_topsubdirs; do
@@ -46268,7 +48000,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -44003,8 +48007,8 @@
+@@ -45224,8 +49485,8 @@
else
install_it="no"
fi
@@ -46279,7 +48011,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -44196,651 +48200,651 @@
+@@ -45417,671 +49678,671 @@
dcoprss_SUBDIR_included_FALSE=
fi
@@ -46424,6 +48156,9 @@
- 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/chatwindow/tests/Makefile"
++ac_config_files="$ac_config_files kopete/kopete/chatwindow/tests/Makefile"
+
- ac_config_files="$ac_config_files kopete/kopete/config/Makefile"
+ac_config_files="$ac_config_files kopete/kopete/config/Makefile"
@@ -46457,6 +48192,9 @@
- 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/compat/Makefile"
++ac_config_files="$ac_config_files kopete/libkopete/compat/Makefile"
+
- ac_config_files="$ac_config_files kopete/libkopete/private/Makefile"
+ac_config_files="$ac_config_files kopete/libkopete/private/Makefile"
@@ -46523,15 +48261,15 @@
- 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/smpppdcs/unittest/Makefile"
++ac_config_files="$ac_config_files kopete/plugins/smpppdcs/unittest/Makefile"
+
- ac_config_files="$ac_config_files kopete/plugins/statistics/Makefile"
+ac_config_files="$ac_config_files kopete/plugins/statistics/Makefile"
@@ -46610,6 +48348,54 @@
- 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/jingle/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile"
+
+- ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile"
+
- ac_config_files="$ac_config_files kopete/protocols/jabber/kioslave/Makefile"
+ac_config_files="$ac_config_files kopete/protocols/jabber/kioslave/Makefile"
@@ -46718,12 +48504,12 @@
- 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/testbed/ui/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/testbed/ui/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"
@@ -46739,9 +48525,12 @@
- 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/libkyahoo/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/yahoo/libkyahoo/Makefile"
+- ac_config_files="$ac_config_files kopete/protocols/yahoo/libkyahoo/tests/Makefile"
++ac_config_files="$ac_config_files kopete/protocols/yahoo/libkyahoo/tests/Makefile"
+
- ac_config_files="$ac_config_files kopete/protocols/yahoo/ui/Makefile"
+ac_config_files="$ac_config_files kopete/protocols/yahoo/ui/Makefile"
@@ -46751,165 +48540,138 @@
- 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/Clean/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clean/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/Clean/Contents/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clean/Contents/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/Clean/Contents/Resources/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clean/Contents/Resources/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/Clean/Contents/Resources/Incoming/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clean/Contents/Resources/Incoming/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/Clean/Contents/Resources/Outgoing/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clean/Contents/Resources/Outgoing/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/Clean/Contents/Resources/images/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clean/Contents/Resources/images/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/Clear/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clear/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/Clear/Contents/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clear/Contents/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/Clear/Contents/Resources/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clear/Contents/Resources/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/Clear/Contents/Resources/Incoming/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clear/Contents/Resources/Incoming/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/Clear/Contents/Resources/Outgoing/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clear/Contents/Resources/Outgoing/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/Clear/Contents/Resources/images/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Clear/Contents/Resources/images/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/Gaim/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Gaim/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/Gaim/Contents/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Gaim/Contents/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/Gaim/Contents/Resources/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Gaim/Contents/Resources/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/Gaim/Contents/Resources/Incoming/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Gaim/Contents/Resources/Incoming/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/Gaim/Contents/Resources/Outgoing/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Gaim/Contents/Resources/Outgoing/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/Gaim/Contents/Resources/Variants/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Gaim/Contents/Resources/Variants/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/Hacker/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Hacker/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/Hacker/Contents/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Hacker/Contents/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/Hacker/Contents/Resources/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Hacker/Contents/Resources/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/Hacker/Contents/Resources/Incoming/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Hacker/Contents/Resources/Incoming/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/Hacker/Contents/Resources/Outgoing/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Hacker/Contents/Resources/Outgoing/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/Hacker/Contents/Resources/Variants/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Hacker/Contents/Resources/Variants/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/Hacker/Contents/Resources/images/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Hacker/Contents/Resources/images/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/Konqi/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Konqi/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/Konqi/Contents/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Konqi/Contents/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/Konqi/Contents/Resources/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Konqi/Contents/Resources/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/Konqi/Contents/Resources/Incoming/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Konqi/Contents/Resources/Incoming/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/Konqi/Contents/Resources/Outgoing/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Konqi/Contents/Resources/Outgoing/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/Konqi/Contents/Resources/Variants/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Konqi/Contents/Resources/Variants/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/Konqi/Contents/Resources/Variants/konqui/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Konqi/Contents/Resources/Variants/konqui/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/Kopete/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Kopete/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/Kopete/Contents/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Kopete/Contents/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/Kopete/Contents/Resources/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Kopete/Contents/Resources/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/Kopete/Contents/Resources/Incoming/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Kopete/Contents/Resources/Incoming/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/Kopete/Contents/Resources/Outgoing/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Kopete/Contents/Resources/Outgoing/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/Kopete/Contents/Resources/Variants/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Kopete/Contents/Resources/Variants/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/Kopete/Contents/Resources/images/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Kopete/Contents/Resources/images/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/Retropete/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Retropete/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/Retropete/Contents/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Retropete/Contents/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/Retropete/Contents/Resources/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Retropete/Contents/Resources/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/Retropete/Contents/Resources/Incoming/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Retropete/Contents/Resources/Incoming/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/Retropete/Contents/Resources/Outgoing/Makefile"
++ac_config_files="$ac_config_files kopete/styles/Retropete/Contents/Resources/Outgoing/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"
@@ -47254,7 +49016,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -44860,39 +48864,58 @@
+@@ -46101,39 +50362,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -47329,7 +49091,7 @@
fi
fi
rm -f confcache
-@@ -44901,38 +48924,31 @@
+@@ -46142,38 +50422,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -47381,7 +49143,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -45202,11 +49218,35 @@
+@@ -46464,11 +50737,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -47419,7 +49181,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -45215,8 +49255,43 @@
+@@ -46477,8 +50774,43 @@
fi
@@ -47464,7 +49226,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -45230,18 +49305,19 @@
+@@ -46492,18 +50824,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -47487,7 +49249,7 @@
as_basename=basename
else
as_basename=false
-@@ -45249,159 +49325,120 @@
+@@ -46511,159 +50844,120 @@
# Name of the executable.
@@ -47718,7 +49480,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -45410,7 +49447,19 @@
+@@ -46672,7 +50966,19 @@
as_mkdir_p=false
fi
@@ -47739,7 +49501,7 @@
# 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 +49468,14 @@
+@@ -46681,31 +50987,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -47771,11 +49533,11 @@
+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.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -45451,30 +49483,20 @@
+@@ -46713,30 +51002,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -47814,7 +49576,16 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -45501,19 +49523,21 @@
+@@ -46744,7 +51023,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+- -V, --version print version number, then exit
++ -V, --version print version number and configuration settings, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+@@ -46763,19 +51042,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -47826,7 +49597,7 @@
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.60a,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -47842,7 +49613,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -45524,39 +49548,24 @@
+@@ -46786,39 +51067,24 @@
do
case $1 in
--*=*)
@@ -47888,7 +49659,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -45566,18 +49575,24 @@
+@@ -46828,18 +51094,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -47918,7 +49689,7 @@
esac
shift
-@@ -45593,359 +49608,371 @@
+@@ -46855,370 +51127,382 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -48008,6 +49779,7 @@
- "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/chatwindow/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/kopete/chatwindow/tests/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" ;;
@@ -48019,6 +49791,7 @@
- "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/compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/libkopete/compat/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" ;;
@@ -48041,9 +49814,9 @@
- "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/smpppdcs/unittest/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/unittest/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" ;;
@@ -48070,6 +49843,22 @@
- "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/jingle/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile" ;;
+- "kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/xmpp/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" ;;
@@ -48106,70 +49895,62 @@
- "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/testbed/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/testbed/ui/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/libkyahoo/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/libkyahoo/Makefile" ;;
+- "kopete/protocols/yahoo/libkyahoo/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/libkyahoo/tests/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" ;;
+- "kopete/styles/Clean/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Makefile" ;;
+- "kopete/styles/Clean/Contents/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Makefile" ;;
+- "kopete/styles/Clean/Contents/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/Makefile" ;;
+- "kopete/styles/Clean/Contents/Resources/Incoming/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/Incoming/Makefile" ;;
+- "kopete/styles/Clean/Contents/Resources/Outgoing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/Outgoing/Makefile" ;;
+- "kopete/styles/Clean/Contents/Resources/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/images/Makefile" ;;
+- "kopete/styles/Clear/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Makefile" ;;
+- "kopete/styles/Clear/Contents/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Makefile" ;;
+- "kopete/styles/Clear/Contents/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/Makefile" ;;
+- "kopete/styles/Clear/Contents/Resources/Incoming/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/Incoming/Makefile" ;;
+- "kopete/styles/Clear/Contents/Resources/Outgoing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/Outgoing/Makefile" ;;
+- "kopete/styles/Clear/Contents/Resources/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/images/Makefile" ;;
+- "kopete/styles/Gaim/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Makefile" ;;
+- "kopete/styles/Gaim/Contents/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Makefile" ;;
+- "kopete/styles/Gaim/Contents/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Makefile" ;;
+- "kopete/styles/Gaim/Contents/Resources/Incoming/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Incoming/Makefile" ;;
+- "kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile" ;;
+- "kopete/styles/Gaim/Contents/Resources/Variants/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Variants/Makefile" ;;
+- "kopete/styles/Hacker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Makefile" ;;
+- "kopete/styles/Hacker/Contents/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Makefile" ;;
+- "kopete/styles/Hacker/Contents/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Makefile" ;;
+- "kopete/styles/Hacker/Contents/Resources/Incoming/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Incoming/Makefile" ;;
+- "kopete/styles/Hacker/Contents/Resources/Outgoing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Outgoing/Makefile" ;;
+- "kopete/styles/Hacker/Contents/Resources/Variants/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Variants/Makefile" ;;
+- "kopete/styles/Hacker/Contents/Resources/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/images/Makefile" ;;
+- "kopete/styles/Konqi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Makefile" ;;
+- "kopete/styles/Konqi/Contents/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Makefile" ;;
+- "kopete/styles/Konqi/Contents/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Makefile" ;;
+- "kopete/styles/Konqi/Contents/Resources/Incoming/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Incoming/Makefile" ;;
+- "kopete/styles/Konqi/Contents/Resources/Outgoing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Outgoing/Makefile" ;;
+- "kopete/styles/Konqi/Contents/Resources/Variants/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Variants/Makefile" ;;
+- "kopete/styles/Konqi/Contents/Resources/Variants/konqui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Variants/konqui/Makefile" ;;
+- "kopete/styles/Kopete/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Makefile" ;;
+- "kopete/styles/Kopete/Contents/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Makefile" ;;
+- "kopete/styles/Kopete/Contents/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Makefile" ;;
+- "kopete/styles/Kopete/Contents/Resources/Incoming/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Incoming/Makefile" ;;
+- "kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile" ;;
+- "kopete/styles/Kopete/Contents/Resources/Variants/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Variants/Makefile" ;;
+- "kopete/styles/Kopete/Contents/Resources/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/images/Makefile" ;;
+- "kopete/styles/Retropete/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Makefile" ;;
+- "kopete/styles/Retropete/Contents/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Makefile" ;;
+- "kopete/styles/Retropete/Contents/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Resources/Makefile" ;;
+- "kopete/styles/Retropete/Contents/Resources/Incoming/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Resources/Incoming/Makefile" ;;
+- "kopete/styles/Retropete/Contents/Resources/Outgoing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Resources/Outgoing/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" ;;
@@ -48286,9 +50067,11 @@
- "wifi/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES wifi/pixmaps/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+- "kopete/protocols/gadu/libgadu/libgadu-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS kopete/protocols/gadu/libgadu/libgadu-config.h" ;;
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++ "kopete/protocols/gadu/libgadu/libgadu-config.h") CONFIG_HEADERS="$CONFIG_HEADERS kopete/protocols/gadu/libgadu/libgadu-config.h" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "dcoprss/Makefile") CONFIG_FILES="$CONFIG_FILES dcoprss/Makefile" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
@@ -48336,6 +50119,7 @@
+ "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/chatwindow/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/kopete/chatwindow/tests/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" ;;
@@ -48347,6 +50131,7 @@
+ "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/compat/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/libkopete/compat/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" ;;
@@ -48369,9 +50154,9 @@
+ "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/smpppdcs/unittest/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/unittest/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" ;;
@@ -48398,6 +50183,22 @@
+ "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/jingle/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile" ;;
++ "kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/jabber/jingle/libjingle/talk/xmpp/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" ;;
@@ -48434,70 +50235,62 @@
+ "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/testbed/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/testbed/ui/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/libkyahoo/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/libkyahoo/Makefile" ;;
++ "kopete/protocols/yahoo/libkyahoo/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/protocols/yahoo/libkyahoo/tests/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" ;;
++ "kopete/styles/Clean/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Makefile" ;;
++ "kopete/styles/Clean/Contents/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Makefile" ;;
++ "kopete/styles/Clean/Contents/Resources/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/Makefile" ;;
++ "kopete/styles/Clean/Contents/Resources/Incoming/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/Incoming/Makefile" ;;
++ "kopete/styles/Clean/Contents/Resources/Outgoing/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/Outgoing/Makefile" ;;
++ "kopete/styles/Clean/Contents/Resources/images/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clean/Contents/Resources/images/Makefile" ;;
++ "kopete/styles/Clear/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Makefile" ;;
++ "kopete/styles/Clear/Contents/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Makefile" ;;
++ "kopete/styles/Clear/Contents/Resources/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/Makefile" ;;
++ "kopete/styles/Clear/Contents/Resources/Incoming/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/Incoming/Makefile" ;;
++ "kopete/styles/Clear/Contents/Resources/Outgoing/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/Outgoing/Makefile" ;;
++ "kopete/styles/Clear/Contents/Resources/images/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Clear/Contents/Resources/images/Makefile" ;;
++ "kopete/styles/Gaim/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Makefile" ;;
++ "kopete/styles/Gaim/Contents/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Makefile" ;;
++ "kopete/styles/Gaim/Contents/Resources/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Makefile" ;;
++ "kopete/styles/Gaim/Contents/Resources/Incoming/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Incoming/Makefile" ;;
++ "kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile" ;;
++ "kopete/styles/Gaim/Contents/Resources/Variants/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Gaim/Contents/Resources/Variants/Makefile" ;;
++ "kopete/styles/Hacker/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Makefile" ;;
++ "kopete/styles/Hacker/Contents/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Makefile" ;;
++ "kopete/styles/Hacker/Contents/Resources/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Makefile" ;;
++ "kopete/styles/Hacker/Contents/Resources/Incoming/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Incoming/Makefile" ;;
++ "kopete/styles/Hacker/Contents/Resources/Outgoing/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Outgoing/Makefile" ;;
++ "kopete/styles/Hacker/Contents/Resources/Variants/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/Variants/Makefile" ;;
++ "kopete/styles/Hacker/Contents/Resources/images/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Hacker/Contents/Resources/images/Makefile" ;;
++ "kopete/styles/Konqi/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Makefile" ;;
++ "kopete/styles/Konqi/Contents/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Makefile" ;;
++ "kopete/styles/Konqi/Contents/Resources/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Makefile" ;;
++ "kopete/styles/Konqi/Contents/Resources/Incoming/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Incoming/Makefile" ;;
++ "kopete/styles/Konqi/Contents/Resources/Outgoing/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Outgoing/Makefile" ;;
++ "kopete/styles/Konqi/Contents/Resources/Variants/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Variants/Makefile" ;;
++ "kopete/styles/Konqi/Contents/Resources/Variants/konqui/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Konqi/Contents/Resources/Variants/konqui/Makefile" ;;
++ "kopete/styles/Kopete/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Makefile" ;;
++ "kopete/styles/Kopete/Contents/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Makefile" ;;
++ "kopete/styles/Kopete/Contents/Resources/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Makefile" ;;
++ "kopete/styles/Kopete/Contents/Resources/Incoming/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Incoming/Makefile" ;;
++ "kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile" ;;
++ "kopete/styles/Kopete/Contents/Resources/Variants/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/Variants/Makefile" ;;
++ "kopete/styles/Kopete/Contents/Resources/images/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Kopete/Contents/Resources/images/Makefile" ;;
++ "kopete/styles/Retropete/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Makefile" ;;
++ "kopete/styles/Retropete/Contents/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Makefile" ;;
++ "kopete/styles/Retropete/Contents/Resources/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Resources/Makefile" ;;
++ "kopete/styles/Retropete/Contents/Resources/Incoming/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Resources/Incoming/Makefile" ;;
++ "kopete/styles/Retropete/Contents/Resources/Outgoing/Makefile") CONFIG_FILES="$CONFIG_FILES kopete/styles/Retropete/Contents/Resources/Outgoing/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" ;;
@@ -48623,7 +50416,7 @@
# 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 +49984,782 @@
+@@ -47230,601 +51514,793 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -48922,6 +50715,8 @@
-s, at LIB_SLP@,$LIB_SLP,;t t
-s, at GLINC@,$GLINC,;t t
-s, at GLLIB@,$GLLIB,;t t
+-s, at compile_LIBKOPETE_COMPAT_TRUE@,$compile_LIBKOPETE_COMPAT_TRUE,;t t
+-s, at compile_LIBKOPETE_COMPAT_FALSE@,$compile_LIBKOPETE_COMPAT_FALSE,;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
@@ -48949,22 +50744,31 @@
-s, at SSL_INCLUDES@,$SSL_INCLUDES,;t t
-s, at SSL_LDFLAGS@,$SSL_LDFLAGS,;t t
-s, at LIBSSL@,$LIBSSL,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at IDN_CFLAGS@,$IDN_CFLAGS,;t t
+-s, at IDN_LIBS@,$IDN_LIBS,;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 GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
+-s, at GLIB_LIBS@,$GLIB_LIBS,;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 include_smsgsm_TRUE@,$include_smsgsm_TRUE,;t t
+-s, at include_smsgsm_FALSE@,$include_smsgsm_FALSE,;t t
+-s, at EXPAT_LIBS@,$EXPAT_LIBS,;t t
+-s, at ALSA_LIBS@,$ALSA_LIBS,;t t
+-s, at ORTP_CFLAGS@,$ORTP_CFLAGS,;t t
+-s, at ORTP_LIBS@,$ORTP_LIBS,;t t
+-s, at SPEEX_CFLAGS@,$SPEEX_CFLAGS,;t t
+-s, at SPEEX_LIBS@,$SPEEX_LIBS,;t t
+-s, at include_jingle_TRUE@,$include_jingle_TRUE,;t t
+-s, at include_jingle_FALSE@,$include_jingle_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
@@ -49399,6 +51203,8 @@
+LIB_SLP!$LIB_SLP$ac_delim
+GLINC!$GLINC$ac_delim
+GLLIB!$GLLIB$ac_delim
++compile_LIBKOPETE_COMPAT_TRUE!$compile_LIBKOPETE_COMPAT_TRUE$ac_delim
++compile_LIBKOPETE_COMPAT_FALSE!$compile_LIBKOPETE_COMPAT_FALSE$ac_delim
+include_smpppdcs_TRUE!$include_smpppdcs_TRUE$ac_delim
+include_smpppdcs_FALSE!$include_smpppdcs_FALSE$ac_delim
+LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
@@ -49426,16 +51232,14 @@
+SSL_INCLUDES!$SSL_INCLUDES$ac_delim
+SSL_LDFLAGS!$SSL_LDFLAGS$ac_delim
+LIBSSL!$LIBSSL$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++IDN_CFLAGS!$IDN_CFLAGS$ac_delim
++IDN_LIBS!$IDN_LIBS$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
++include_meanwhile_TRUE!$include_meanwhile_TRUE$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -49477,12 +51281,23 @@
+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
++GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
++GLIB_LIBS!$GLIB_LIBS$ac_delim
+include_msn_webcam_TRUE!$include_msn_webcam_TRUE$ac_delim
+include_msn_webcam_FALSE!$include_msn_webcam_FALSE$ac_delim
++include_smsgsm_TRUE!$include_smsgsm_TRUE$ac_delim
++include_smsgsm_FALSE!$include_smsgsm_FALSE$ac_delim
++EXPAT_LIBS!$EXPAT_LIBS$ac_delim
++ALSA_LIBS!$ALSA_LIBS$ac_delim
++ORTP_CFLAGS!$ORTP_CFLAGS$ac_delim
++ORTP_LIBS!$ORTP_LIBS$ac_delim
++SPEEX_CFLAGS!$SPEEX_CFLAGS$ac_delim
++SPEEX_LIBS!$SPEEX_LIBS$ac_delim
++include_jingle_TRUE!$include_jingle_TRUE$ac_delim
++include_jingle_FALSE!$include_jingle_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
@@ -49533,7 +51348,7 @@
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -49935,7 +51750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -46548,248 +50767,130 @@
+@@ -47832,248 +52308,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -50285,7 +52100,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -46800,135 +50901,39 @@
+@@ -48084,135 +52442,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -50447,7 +52262,7 @@
# 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 +50943,29 @@
+@@ -48222,18 +52484,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
@@ -50485,7 +52300,7 @@
else
continue
fi
-@@ -46971,53 +50987,79 @@
+@@ -48255,53 +52528,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -50598,14 +52413,14 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdenetwork, "3.5.5") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -527,8 +529,20 @@
+@@ -549,8 +551,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -50628,94 +52443,17 @@
if ( maj != 1 ) {
return 1;
}
-@@ -647,28 +661,32 @@
- AC_SUBST(IDN_CPPFLAGS)
- AC_SUBST(IDN_LIBS)
-
--
--#
- # Sametime support
--#
-
- # lower and upper-bound versions of Meanwhile library
--m4_define(meanwhile_version_min, 0.4.2)
--m4_define(meanwhile_version_max, 0.5.0)
-+m4_define(libmeanwhile_version_min, 1.0.1)
-+m4_define(libmeanwhile_version_max, 1.1.0)
-
- # Let the user disable the plugin
--AC_ARG_ENABLE(sametime-plugin,
-- AC_HELP_STRING([--enable-sametime-plugin], [build the Kopete Sametime plugin @<:@default=no@:>@]),
-- [compile_meanwhile=$enableval],
-- [compile_meanwhile=no]
-+AC_ARG_ENABLE(meanwhile,
-+ AC_HELP_STRING([--disable-meanwhile],
-+ [disable the Kopete Meanwhile plugin (Lotus Sametime support) @<:@default=enabled@:>@]),
- )
-
--# Check and setup for Meanwhile library
--KDE_PKG_CHECK_MODULES(MEANWHILE,
-- [meanwhile >= meanwhile_version_min meanwhile < meanwhile_version_max],
-- [have_meanwhile=yes],
-- [have_meanwhile=no]
-- )
-+if test "x$enable_meanwhile" != "xno"; then
-+ # Check and setup for libmeanwhile
-+ KDE_PKG_CHECK_MODULES(MEANWHILE,
-+ [meanwhile >= libmeanwhile_version_min meanwhile < libmeanwhile_version_max],
-+ [have_libmeanwhile=yes], [have_libmeanwhile=no])
-+
-+ if test "x$have_libmeanwhile" = "xno"; then
-+ enable_meanwhile=no
-+ AC_MSG_RESULT([not found])
-+ else
-+ AC_MSG_RESULT([found])
-+ fi
-+fi
-+
- AC_SUBST(MEANWHILE_CFLAGS)
- AC_SUBST(MEANWHILE_LIBS)
-
-@@ -681,21 +699,15 @@
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
-
--# Do we everything we need to compile the plugin
--if test "x$have_meanwhile" != "xyes" || test "x$have_glib" != "xyes"; then
-- compile_meanwhile=no
-+AC_MSG_CHECKING([if Meanwhile plugin should be compiled])
-+if test "x$enable_meanwhile" != "xno"; then
-+ AC_MSG_RESULT([yes])
-+else
-+ AC_MSG_RESULT([no])
- fi
-
--# Let the user know
--AC_MSG_CHECKING([if Sametime Plugin should be compiled])
--AC_MSG_RESULT($compile_meanwhile)
--
--# Here we go
--AM_CONDITIONAL(include_meanwhile, [test "x$compile_meanwhile" = "xyes"])
--
--#
--# End of Sametime support
--#
-+# Set the flag to compile meanwhile
-+AM_CONDITIONAL(include_meanwhile, [test "x$enable_meanwhile" != "xno"])
-
- # testbed protocol
- dnl define the configure option that disables testbed protocol
--- dcoprss/Makefile.in
+++ dcoprss/Makefile.in
-@@ -169,6 +169,7 @@
+@@ -172,6 +172,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -267,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -50725,7 +52463,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -308,6 +312,7 @@
+@@ -314,6 +318,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -50733,7 +52471,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -319,12 +324,9 @@
+@@ -325,12 +330,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -50746,9 +52484,9 @@
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@
+@@ -351,10 +353,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -50760,7 +52498,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -355,6 +360,7 @@
+@@ -363,6 +368,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -50768,7 +52506,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -431,12 +437,15 @@
+@@ -443,12 +449,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -50784,7 +52522,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -482,7 +491,7 @@
+@@ -494,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -50793,7 +52531,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +529,9 @@
+@@ -532,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50805,7 +52543,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -821,18 +830,18 @@
+@@ -833,18 +842,18 @@
mocs: feedbrowser.moc
#>+ 3
@@ -50830,7 +52568,7 @@
#>+ 3
service.moc: $(srcdir)/service.h
-@@ -853,7 +862,7 @@
+@@ -865,7 +874,7 @@
#>+ 3
clean-metasources:
@@ -50839,7 +52577,7 @@
#>+ 2
KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh
-@@ -919,7 +928,7 @@
+@@ -931,7 +940,7 @@
rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
#>+ 11
@@ -50850,15 +52588,15 @@
echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
--- doc/kcontrol/kcmktalkd/Makefile.in
+++ doc/kcontrol/kcmktalkd/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -50868,7 +52606,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -50876,7 +52614,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -50889,9 +52627,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -50903,7 +52641,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -50911,7 +52649,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -50927,7 +52665,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -50936,7 +52674,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50950,15 +52688,15 @@
mostlyclean-libtool:
--- doc/kcontrol/lanbrowser/Makefile.in
+++ doc/kcontrol/lanbrowser/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -50968,7 +52706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -50976,7 +52714,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -50989,9 +52727,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51003,7 +52741,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51011,7 +52749,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51027,7 +52765,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51036,7 +52774,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51050,15 +52788,15 @@
mostlyclean-libtool:
--- doc/kcontrol/Makefile.in
+++ doc/kcontrol/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51068,7 +52806,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51076,7 +52814,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51089,9 +52827,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51103,7 +52841,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51111,7 +52849,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51127,7 +52865,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -51136,7 +52874,7 @@
KDE_LANG = en
KDE_DOCS = AUTO
#>- all: all-recursive
-@@ -413,7 +422,7 @@
+@@ -425,7 +434,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -51145,7 +52883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +460,9 @@
+@@ -463,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51159,15 +52897,15 @@
mostlyclean-libtool:
--- doc/kdict/Makefile.in
+++ doc/kdict/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51177,7 +52915,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51185,7 +52923,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51198,9 +52936,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51212,7 +52950,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51220,7 +52958,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51236,7 +52974,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51245,7 +52983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51257,7 +52995,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -582,7 +591,7 @@
+@@ -594,7 +603,7 @@
KDE_DIST=Makefile.in applet.png seteditor.png index.docbook mainwin.png Makefile.am conf.png index.cache.bz2
#>+ 24
@@ -51266,7 +53004,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +618,20 @@
+@@ -621,20 +630,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict
@@ -51292,15 +53030,15 @@
--- doc/kget/Makefile.in
+++ doc/kget/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51310,7 +53048,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51318,7 +53056,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51331,9 +53069,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51345,7 +53083,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51353,7 +53091,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51369,7 +53107,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51378,7 +53116,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51390,7 +53128,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +588,10 @@
+@@ -591,10 +600,10 @@
.NOEXPORT:
#>+ 2
@@ -51403,7 +53141,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +618,20 @@
+@@ -621,20 +630,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget
@@ -51429,15 +53167,15 @@
--- doc/knewsticker/Makefile.in
+++ doc/knewsticker/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51447,7 +53185,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51455,7 +53193,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51468,9 +53206,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51482,7 +53220,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51490,7 +53228,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51506,7 +53244,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51515,7 +53253,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51527,7 +53265,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +588,10 @@
+@@ -591,10 +600,10 @@
.NOEXPORT:
#>+ 2
@@ -51540,7 +53278,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +618,20 @@
+@@ -621,20 +630,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker
@@ -51566,15 +53304,15 @@
--- doc/kopete/Makefile.in
+++ doc/kopete/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51584,7 +53322,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51592,7 +53330,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51605,9 +53343,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51619,7 +53357,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51627,7 +53365,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51643,7 +53381,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51652,7 +53390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51664,50 +53402,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -582,7 +591,7 @@
- KDE_DIST=Makefile.in index.docbook menus.docbook Makefile.am index.cache.bz2
+@@ -594,7 +603,7 @@
+ KDE_DIST=Makefile.in chatstyle.docbook 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
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) chatstyle.docbook index.docbook menus.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) chatstyle.docbook 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 +618,20 @@
+@@ -621,20 +630,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 \
+- @for base in chatstyle.docbook index.docbook menus.docbook ; do \
++ @for base in chatstyle.docbook 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 \
+- for base in chatstyle.docbook index.docbook menus.docbook ; do \
++ for base in chatstyle.docbook 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 \
+- for file in chatstyle.docbook index.docbook menus.docbook ; do \
++ for file in chatstyle.docbook menus.docbook index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
--- doc/kpf/Makefile.in
+++ doc/kpf/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51717,7 +53455,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51725,7 +53463,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51738,9 +53476,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51752,7 +53490,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51760,7 +53498,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51776,7 +53514,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51785,7 +53523,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51799,15 +53537,15 @@
mostlyclean-libtool:
--- doc/kppp/Makefile.in
+++ doc/kppp/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51817,7 +53555,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51825,7 +53563,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51838,9 +53576,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51852,7 +53590,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51860,7 +53598,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -51876,7 +53614,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -51885,7 +53623,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51897,7 +53635,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -582,7 +591,7 @@
+@@ -594,7 +603,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
@@ -51906,7 +53644,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +618,20 @@
+@@ -621,20 +630,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp
@@ -51932,15 +53670,15 @@
--- doc/krdc/Makefile.in
+++ doc/krdc/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -51950,7 +53688,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -51958,7 +53696,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -51971,9 +53709,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -51985,7 +53723,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -51993,7 +53731,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52009,7 +53747,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52018,7 +53756,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52030,7 +53768,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +588,10 @@
+@@ -591,10 +600,10 @@
.NOEXPORT:
#>+ 2
@@ -52043,7 +53781,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +618,20 @@
+@@ -621,20 +630,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc
@@ -52069,15 +53807,15 @@
--- doc/krfb/Makefile.in
+++ doc/krfb/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52087,7 +53825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52095,7 +53833,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52108,9 +53846,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52122,7 +53860,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52130,7 +53868,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52146,7 +53884,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52155,7 +53893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52167,7 +53905,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +588,10 @@
+@@ -591,10 +600,10 @@
.NOEXPORT:
#>+ 2
@@ -52180,7 +53918,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +618,20 @@
+@@ -621,20 +630,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb
@@ -52206,15 +53944,15 @@
--- doc/ksirc/Makefile.in
+++ doc/ksirc/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52224,7 +53962,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52232,7 +53970,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52245,9 +53983,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52259,7 +53997,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52267,7 +54005,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52283,7 +54021,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52292,7 +54030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52306,15 +54044,15 @@
mostlyclean-libtool:
--- doc/ktalkd/Makefile.in
+++ doc/ktalkd/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52324,7 +54062,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52332,7 +54070,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52345,9 +54083,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52359,7 +54097,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52367,7 +54105,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52383,7 +54121,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52392,7 +54130,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52406,15 +54144,15 @@
mostlyclean-libtool:
--- doc/kwifimanager/Makefile.in
+++ doc/kwifimanager/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52424,7 +54162,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52432,7 +54170,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52445,9 +54183,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52459,7 +54197,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52467,7 +54205,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52483,7 +54221,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52492,7 +54230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52506,15 +54244,15 @@
mostlyclean-libtool:
--- doc/lisa/Makefile.in
+++ doc/lisa/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52524,7 +54262,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52532,7 +54270,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52545,9 +54283,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52559,7 +54297,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52567,7 +54305,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52583,7 +54321,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -52592,7 +54330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52606,15 +54344,15 @@
mostlyclean-libtool:
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52624,7 +54362,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52632,7 +54370,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52645,9 +54383,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52659,7 +54397,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52667,7 +54405,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52683,7 +54421,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,13 +416,13 @@
+@@ -419,13 +428,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -52699,7 +54437,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +460,9 @@
+@@ -463,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52713,15 +54451,15 @@
mostlyclean-libtool:
--- filesharing/advanced/kcm_sambaconf/Makefile.in
+++ filesharing/advanced/kcm_sambaconf/Makefile.in
-@@ -164,6 +164,7 @@
+@@ -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@
-@@ -260,6 +261,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -262,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52731,7 +54469,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -303,6 +307,7 @@
+@@ -309,6 +313,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52739,7 +54477,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -314,12 +319,9 @@
+@@ -320,12 +325,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52752,9 +54490,9 @@
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@
+@@ -346,10 +348,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52766,7 +54504,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -350,6 +355,7 @@
+@@ -358,6 +363,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52774,7 +54512,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -426,12 +432,15 @@
+@@ -438,12 +444,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52790,7 +54528,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -527,7 +536,7 @@
+@@ -539,7 +548,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -52799,7 +54537,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +574,9 @@
+@@ -577,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52811,7 +54549,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -879,18 +888,18 @@
+@@ -891,18 +900,18 @@
mocs: kcmsambaconf.moc
#>+ 3
@@ -52836,7 +54574,7 @@
#>+ 3
hiddenfileview.moc: $(srcdir)/hiddenfileview.h
-@@ -959,10 +968,10 @@
+@@ -971,10 +980,10 @@
#>+ 3
clean-metasources:
@@ -52851,15 +54589,15 @@
clean-ui:
--- filesharing/advanced/Makefile.in
+++ filesharing/advanced/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52869,7 +54607,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52877,7 +54615,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52890,9 +54628,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -52904,7 +54642,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -52912,7 +54650,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -52928,7 +54666,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -52937,7 +54675,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52951,15 +54689,15 @@
mostlyclean-libtool:
--- filesharing/advanced/nfs/Makefile.in
+++ filesharing/advanced/nfs/Makefile.in
-@@ -135,6 +135,7 @@
+@@ -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@
-@@ -231,6 +232,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -233,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -52969,7 +54707,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -274,6 +278,7 @@
+@@ -280,6 +284,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -52977,7 +54715,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -285,12 +290,9 @@
+@@ -291,12 +296,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -52990,9 +54728,9 @@
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@
+@@ -317,10 +319,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53004,7 +54742,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -321,6 +326,7 @@
+@@ -329,6 +334,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53012,7 +54750,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -397,12 +403,15 @@
+@@ -409,12 +415,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53028,7 +54766,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -447,7 +456,7 @@
+@@ -459,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53037,7 +54775,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +494,9 @@
+@@ -497,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53051,15 +54789,15 @@
clean-noinstLTLIBRARIES:
--- filesharing/advanced/propsdlgplugin/Makefile.in
+++ filesharing/advanced/propsdlgplugin/Makefile.in
-@@ -157,6 +157,7 @@
+@@ -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@
-@@ -253,6 +254,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -255,6 +256,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53069,7 +54807,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +300,7 @@
+@@ -302,6 +306,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53077,7 +54815,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -307,12 +312,9 @@
+@@ -313,12 +318,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53090,9 +54828,9 @@
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@
+@@ -339,10 +341,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53104,7 +54842,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -343,6 +348,7 @@
+@@ -351,6 +356,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53112,7 +54850,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -419,12 +425,15 @@
+@@ -431,12 +437,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53128,7 +54866,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -471,7 +480,7 @@
+@@ -483,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53137,7 +54875,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +518,9 @@
+@@ -521,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53151,15 +54889,15 @@
@$(NORMAL_INSTALL)
--- filesharing/Makefile.in
+++ filesharing/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53169,7 +54907,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53177,7 +54915,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53190,9 +54928,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53204,7 +54942,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53212,7 +54950,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53228,7 +54966,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -53237,7 +54975,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53251,15 +54989,15 @@
mostlyclean-libtool:
--- filesharing/simple/Makefile.in
+++ filesharing/simple/Makefile.in
-@@ -152,6 +152,7 @@
+@@ -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@
-@@ -248,6 +249,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -250,6 +251,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53269,7 +55007,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -291,6 +295,7 @@
+@@ -297,6 +301,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53277,7 +55015,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -302,12 +307,9 @@
+@@ -308,12 +313,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53290,9 +55028,9 @@
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@
+@@ -334,10 +336,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53304,7 +55042,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -338,6 +343,7 @@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53312,7 +55050,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -414,12 +420,15 @@
+@@ -426,12 +432,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53328,7 +55066,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -469,7 +478,7 @@
+@@ -481,7 +490,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53337,7 +55075,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +516,9 @@
+@@ -519,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53351,15 +55089,15 @@
@$(NORMAL_INSTALL)
--- kdict/applet/Makefile.in
+++ kdict/applet/Makefile.in
-@@ -146,6 +146,7 @@
+@@ -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@
-@@ -242,6 +243,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -244,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53369,7 +55107,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -285,6 +289,7 @@
+@@ -291,6 +295,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53377,7 +55115,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -296,12 +301,9 @@
+@@ -302,12 +307,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53390,9 +55128,9 @@
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@
+@@ -328,10 +330,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53404,7 +55142,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -332,6 +337,7 @@
+@@ -340,6 +345,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53412,7 +55150,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -408,12 +414,15 @@
+@@ -420,12 +426,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53428,7 +55166,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -449,7 +458,7 @@
+@@ -461,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53437,7 +55175,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +496,9 @@
+@@ -499,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53451,15 +55189,15 @@
@$(NORMAL_INSTALL)
--- kdict/Makefile.in
+++ kdict/Makefile.in
-@@ -180,6 +180,7 @@
+@@ -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@
-@@ -276,6 +277,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -278,6 +279,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53469,7 +55207,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,6 +323,7 @@
+@@ -325,6 +329,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53477,7 +55215,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -330,12 +335,9 @@
+@@ -336,12 +341,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53490,9 +55228,9 @@
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@
+@@ -362,10 +364,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53504,7 +55242,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -366,6 +371,7 @@
+@@ -374,6 +379,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53512,7 +55250,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -442,12 +448,15 @@
+@@ -454,12 +460,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53528,7 +55266,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -503,7 +512,7 @@
+@@ -515,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53537,7 +55275,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +550,9 @@
+@@ -553,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53549,7 +55287,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1051,13 +1060,6 @@
+@@ -1063,13 +1072,6 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
#>+ 3
@@ -53563,7 +55301,7 @@
actions.moc: $(srcdir)/actions.h
$(MOC) $(srcdir)/actions.h -o actions.moc
-@@ -1065,25 +1067,18 @@
+@@ -1077,25 +1079,18 @@
mocs: actions.moc
#>+ 3
@@ -53595,7 +55333,7 @@
#>+ 3
application.moc: $(srcdir)/application.h
-@@ -1106,6 +1101,20 @@
+@@ -1118,6 +1113,20 @@
#>+ 2
mocs: dict.moc
@@ -53616,7 +55354,7 @@
#>+ 8
kdict.la.closure: $(kdict_la_OBJECTS) $(kdict_la_DEPENDENCIES)
@echo "int main() {return 0;}" > kdict_la_closure.cpp
-@@ -1117,10 +1126,10 @@
+@@ -1129,10 +1138,10 @@
#>+ 3
clean-metasources:
@@ -53629,7 +55367,7 @@
#>+ 4
clean-idl:
-@@ -1136,8 +1145,6 @@
+@@ -1148,8 +1157,6 @@
#>+ 22
install-kde-icons:
@@ -53638,7 +55376,7 @@
$(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 +1153,17 @@
+@@ -1158,15 +1165,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
@@ -53657,7 +55395,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdict.png
#>+ 15
-@@ -1196,7 +1205,7 @@
+@@ -1208,7 +1217,7 @@
#>+ 11
@@ -53668,15 +55406,15 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdict_la.all_cpp.final; \
--- kdict/pics/Makefile.in
+++ kdict/pics/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53686,7 +55424,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53694,7 +55432,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53707,9 +55445,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53721,7 +55459,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53729,7 +55467,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53745,7 +55483,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -53754,7 +55492,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53766,7 +55504,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,19 +593,19 @@
+@@ -596,19 +605,19 @@
#>+ 15
install-kde-icons:
@@ -53791,15 +55529,15 @@
force-reedit:
--- kdnssd/ioslave/Makefile.in
+++ kdnssd/ioslave/Makefile.in
-@@ -147,6 +147,7 @@
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -245,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53809,7 +55547,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -292,6 +296,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53817,7 +55555,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -303,12 +308,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53830,9 +55568,9 @@
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@
+@@ -329,10 +331,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53844,7 +55582,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53852,7 +55590,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -421,12 +427,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53868,7 +55606,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -452,7 +461,7 @@
+@@ -464,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53877,7 +55615,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +499,9 @@
+@@ -502,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53889,7 +55627,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -830,7 +839,7 @@
+@@ -842,7 +851,7 @@
-rm -f dnssd.moc
#>+ 2
@@ -53900,15 +55638,15 @@
clean-closures:
--- kdnssd/kdedmodule/Makefile.in
+++ kdnssd/kdedmodule/Makefile.in
-@@ -147,6 +147,7 @@
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -245,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -53918,7 +55656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -292,6 +296,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -53926,7 +55664,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -303,12 +308,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -53939,9 +55677,9 @@
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@
+@@ -329,10 +331,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -53953,7 +55691,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -53961,7 +55699,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -421,12 +427,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -53977,7 +55715,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -450,7 +459,7 @@
+@@ -462,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -53986,7 +55724,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +497,9 @@
+@@ -500,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54000,15 +55738,15 @@
@$(NORMAL_INSTALL)
--- kdnssd/Makefile.in
+++ kdnssd/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54018,7 +55756,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54026,7 +55764,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54039,9 +55777,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54053,7 +55791,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54061,7 +55799,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54077,7 +55815,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -54086,7 +55824,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54100,15 +55838,15 @@
mostlyclean-libtool:
--- kfile-plugins/Makefile.in
+++ kfile-plugins/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54118,7 +55856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54126,7 +55864,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54139,9 +55877,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54153,7 +55891,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54161,7 +55899,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54177,7 +55915,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -54186,7 +55924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54200,15 +55938,15 @@
mostlyclean-libtool:
--- kfile-plugins/torrent/Makefile.in
+++ kfile-plugins/torrent/Makefile.in
-@@ -151,6 +151,7 @@
+@@ -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@
-@@ -247,6 +248,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -249,6 +250,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54218,7 +55956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +294,7 @@
+@@ -296,6 +300,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54226,7 +55964,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -301,12 +306,9 @@
+@@ -307,12 +312,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54239,9 +55977,9 @@
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@
+@@ -333,10 +335,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54253,7 +55991,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -337,6 +342,7 @@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54261,7 +55999,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -413,12 +419,15 @@
+@@ -425,12 +431,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54277,7 +56015,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -459,7 +468,7 @@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -54286,7 +56024,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +506,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54300,15 +56038,15 @@
@$(NORMAL_INSTALL)
--- kget/icons/Makefile.in
+++ kget/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54318,7 +56056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54326,7 +56064,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54339,9 +56077,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54353,7 +56091,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54361,7 +56099,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54377,7 +56115,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -54386,7 +56124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54398,7 +56136,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +586,7 @@
+@@ -589,7 +598,7 @@
.NOEXPORT:
#>+ 2
@@ -54407,7 +56145,7 @@
#>+ 2
docs-am:
-@@ -586,59 +595,59 @@
+@@ -598,59 +607,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
@@ -54499,15 +56237,15 @@
force-reedit:
--- kget/kget_plug_in/Makefile.in
+++ kget/kget_plug_in/Makefile.in
-@@ -145,6 +145,7 @@
+@@ -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@
-@@ -241,6 +242,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -243,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54517,7 +56255,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -284,6 +288,7 @@
+@@ -290,6 +294,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54525,7 +56263,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -295,12 +300,9 @@
+@@ -301,12 +306,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54538,9 +56276,9 @@
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@
+@@ -327,10 +329,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54552,7 +56290,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -331,6 +336,7 @@
+@@ -339,6 +344,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54560,7 +56298,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -407,12 +413,15 @@
+@@ -419,12 +425,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54576,7 +56314,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -447,7 +456,7 @@
+@@ -459,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -54585,7 +56323,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +494,9 @@
+@@ -497,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54599,15 +56337,15 @@
@$(NORMAL_INSTALL)
--- kget/Makefile.in
+++ kget/Makefile.in
-@@ -187,6 +187,7 @@
+@@ -190,6 +190,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -285,6 +286,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54617,7 +56355,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +330,7 @@
+@@ -332,6 +336,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54625,7 +56363,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -337,12 +342,9 @@
+@@ -343,12 +348,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54638,9 +56376,9 @@
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@
+@@ -369,10 +371,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54652,7 +56390,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -373,6 +378,7 @@
+@@ -381,6 +386,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54660,7 +56398,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -449,12 +455,15 @@
+@@ -461,12 +467,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54676,7 +56414,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -524,7 +533,7 @@
+@@ -536,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -54685,7 +56423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +571,9 @@
+@@ -574,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54697,7 +56435,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1071,18 +1080,18 @@
+@@ -1083,18 +1092,18 @@
mocs: dlgAdvanced.moc
#>+ 3
@@ -54722,7 +56460,7 @@
#>+ 3
slave.moc: $(srcdir)/slave.h
-@@ -1113,18 +1122,18 @@
+@@ -1125,18 +1134,18 @@
mocs: dlgSystem.moc
#>+ 3
@@ -54747,7 +56485,7 @@
#>+ 3
droptarget.moc: $(srcdir)/droptarget.h
-@@ -1163,7 +1172,7 @@
+@@ -1175,7 +1184,7 @@
#>+ 3
clean-metasources:
@@ -54756,7 +56494,7 @@
#>+ 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 +1197,31 @@
+@@ -1200,31 +1209,31 @@
#>+ 28
install-kde-icons:
@@ -54800,7 +56538,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kget_list.png
#>+ 15
-@@ -1254,7 +1263,7 @@
+@@ -1266,7 +1275,7 @@
#>+ 11
@@ -54811,15 +56549,15 @@
echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
--- kget/pics/Makefile.in
+++ kget/pics/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54829,7 +56567,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54837,7 +56575,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54850,9 +56588,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54864,7 +56602,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54872,7 +56610,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54888,7 +56626,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -411,7 +420,7 @@
+@@ -423,7 +432,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -54897,7 +56635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +458,9 @@
+@@ -461,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54911,15 +56649,15 @@
mostlyclean-libtool:
--- kget/sounds/Makefile.in
+++ kget/sounds/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -54929,7 +56667,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -54937,7 +56675,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -54950,9 +56688,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -54964,7 +56702,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -54972,7 +56710,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -54988,7 +56726,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -406,7 +415,7 @@
+@@ -418,7 +427,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -54997,7 +56735,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +453,9 @@
+@@ -456,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55011,15 +56749,15 @@
mostlyclean-libtool:
--- knewsticker/common/Makefile.in
+++ knewsticker/common/Makefile.in
-@@ -141,6 +141,7 @@
+@@ -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@
-@@ -237,6 +238,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -239,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55029,7 +56767,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -280,6 +284,7 @@
+@@ -286,6 +290,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55037,7 +56775,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -291,12 +296,9 @@
+@@ -297,12 +302,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -55050,9 +56788,9 @@
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@
+@@ -323,10 +325,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -55064,7 +56802,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -327,6 +332,7 @@
+@@ -335,6 +340,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -55072,7 +56810,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -403,12 +409,15 @@
+@@ -415,12 +421,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -55088,7 +56826,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -450,7 +459,7 @@
+@@ -462,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55097,7 +56835,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +497,9 @@
+@@ -500,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55111,15 +56849,15 @@
clean-noinstLTLIBRARIES:
--- knewsticker/knewstickerstub/Makefile.in
+++ knewsticker/knewstickerstub/Makefile.in
-@@ -144,6 +144,7 @@
+@@ -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@
-@@ -240,6 +241,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -242,6 +243,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55129,7 +56867,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -283,6 +287,7 @@
+@@ -289,6 +293,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55137,7 +56875,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -294,12 +299,9 @@
+@@ -300,12 +305,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -55150,9 +56888,9 @@
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@
+@@ -326,10 +328,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -55164,7 +56902,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -330,6 +335,7 @@
+@@ -338,6 +343,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -55172,7 +56910,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -406,12 +412,15 @@
+@@ -418,12 +424,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -55188,7 +56926,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -444,7 +453,7 @@
+@@ -456,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55197,7 +56935,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +491,9 @@
+@@ -494,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55211,15 +56949,15 @@
@$(NORMAL_INSTALL)
--- knewsticker/kntsrcfilepropsdlg/Makefile.in
+++ knewsticker/kntsrcfilepropsdlg/Makefile.in
-@@ -148,6 +148,7 @@
+@@ -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@
-@@ -244,6 +245,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -246,6 +247,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55229,7 +56967,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -287,6 +291,7 @@
+@@ -293,6 +297,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55237,7 +56975,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -298,12 +303,9 @@
+@@ -304,12 +309,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -55250,9 +56988,9 @@
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@
+@@ -330,10 +332,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -55264,7 +57002,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -334,6 +339,7 @@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -55272,7 +57010,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -410,12 +416,15 @@
+@@ -422,12 +428,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -55288,7 +57026,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -454,7 +463,7 @@
+@@ -466,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55297,7 +57035,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -492,9 +501,9 @@
+@@ -504,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55311,15 +57049,15 @@
@$(NORMAL_INSTALL)
--- knewsticker/Makefile.in
+++ knewsticker/Makefile.in
-@@ -176,6 +176,7 @@
+@@ -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@
-@@ -272,6 +273,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -274,6 +275,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55329,7 +57067,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -315,6 +319,7 @@
+@@ -321,6 +325,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55337,7 +57075,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -326,12 +331,9 @@
+@@ -332,12 +337,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -55350,9 +57088,9 @@
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@
+@@ -358,10 +360,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -55364,7 +57102,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -362,6 +367,7 @@
+@@ -370,6 +375,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -55372,7 +57110,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -438,12 +444,15 @@
+@@ -450,12 +456,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -55388,7 +57126,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -497,7 +506,7 @@
+@@ -509,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55397,7 +57135,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +544,9 @@
+@@ -547,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55409,7 +57147,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1032,18 +1041,18 @@
+@@ -1044,18 +1053,18 @@
mocs: newsscroller.moc
#>+ 3
@@ -55434,7 +57172,7 @@
#>+ 3
newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
-@@ -1054,10 +1063,10 @@
+@@ -1066,10 +1075,10 @@
#>+ 3
clean-metasources:
@@ -55447,7 +57185,7 @@
#>+ 4
clean-idl:
-@@ -1079,17 +1088,17 @@
+@@ -1091,17 +1100,17 @@
#>+ 13
install-kde-icons:
@@ -55468,7 +57206,7 @@
#>+ 15
force-reedit:
-@@ -1130,7 +1139,7 @@
+@@ -1142,7 +1151,7 @@
#>+ 11
@@ -55479,15 +57217,15 @@
echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
--- kopete/icons/Makefile.in
+++ kopete/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55497,7 +57235,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55505,7 +57243,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -55518,9 +57256,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -55532,7 +57270,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -55540,7 +57278,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -55556,7 +57294,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -405,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -55565,7 +57303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -443,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55577,207 +57315,361 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,116 +586,116 @@
+@@ -588,196 +597,196 @@
.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
+-KDE_DIST=cr16-action-metacontact_unknown.png cr32-action-kopeteeditstatusmessage.png cr32-action-metacontact_online.png hi32-action-kopeteavailable.png cr32-action-show_offliners.png cr22-action-voicecall.png cr22-action-edit_user.png cr22-action-webcamsend.png cr32-action-delete_user.png cr22-action-add_user.png cr128-action-webcamsend.png cr16-action-voicecall.png cr16-action-kopetestatusmessage.png cr128-action-voicecall.png cr32-action-account_offline_overlay.png hi16-action-kopeteaway.png hi16-action-status_unknown_overlay.png cr16-action-contact_xa_overlay.png cr16-action-delete_user.png cr32-action-voicecall.png cr16-action-contact_busy_overlay.png cr48-action-webcamreceive.png cr48-action-metacontact_offline.png cr128-action-webcamreceive.png cr48-action-metacontact_online.png cr32-action-webcamreceive.png cr16-action-contact_phone_overlay.png cr16-action-contact_away_overlay.png cr22-action-webcamreceive.png cr32-action-newmessage.mng cr22-action-show_offliners.png cr16-action-newmsg.png cr22-action-delete_user.png cr32-action-edit_user.png cr64-action-webcamsend.png cr16-action-edit_user.png cr16-action-metacontact_away.png cr16-action-status_unknown_overlay.png cr22-action-kopeteeditstatusmessage.png cr16-action-add_user.png cr16-action-emoticon.png cr48-action-kopeteavailable.png cr16-action-kopeteeditstatusmessage.png hi32-action-newmessage.mng cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi16-action-emoticon.png cr16-action-kopeteavailable.png cr16-action-webcamsend.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 cr32-action-webcamsend.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 cr32-action-add_user.png cr48-action-webcamsend.png cr32-action-search_user.png cr48-action-voicecall.png cr64-action-webcamreceive.png cr16-action-webcamreceive.png hi16-action-status_unknown.png hi48-action-kopeteaway.png cr16-action-show_offliners.png cr16-action-contact_invisible_overlay.png Makefile.in cr64-action-voicecall.png 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 cr22-action-search_user.png cr16-action-kopeteaway.png cr48-action-kopeteaway.png cr16-action-account_offline_overlay.png Makefile.am cr16-action-search_user.png hi32-action-kopeteaway.png
++KDE_DIST=cr16-action-metacontact_unknown.png cr32-action-kopeteeditstatusmessage.png cr32-action-metacontact_online.png hi32-action-kopeteavailable.png cr32-action-show_offliners.png cr22-action-voicecall.png cr22-action-edit_user.png cr22-action-webcamsend.png cr32-action-delete_user.png cr22-action-add_user.png cr128-action-webcamsend.png cr16-action-voicecall.png cr32-action-account_offline_overlay.png cr16-action-kopetestatusmessage.png cr128-action-voicecall.png hi16-action-kopeteaway.png hi16-action-status_unknown_overlay.png cr16-action-contact_xa_overlay.png cr16-action-delete_user.png cr32-action-voicecall.png cr16-action-contact_busy_overlay.png cr48-action-webcamreceive.png cr48-action-metacontact_offline.png cr128-action-webcamreceive.png cr48-action-metacontact_online.png cr32-action-webcamreceive.png cr16-action-contact_phone_overlay.png cr16-action-contact_away_overlay.png cr22-action-webcamreceive.png cr32-action-newmessage.mng cr16-action-newmsg.png cr22-action-show_offliners.png cr22-action-delete_user.png cr32-action-edit_user.png cr64-action-webcamsend.png cr16-action-edit_user.png cr16-action-metacontact_away.png cr16-action-add_user.png cr16-action-status_unknown_overlay.png cr16-action-emoticon.png cr22-action-kopeteeditstatusmessage.png cr48-action-kopeteavailable.png cr16-action-kopeteeditstatusmessage.png hi32-action-newmessage.mng cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi16-action-emoticon.png cr16-action-kopeteavailable.png cr16-action-webcamsend.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 cr32-action-webcamsend.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 cr48-action-webcamsend.png cr32-action-add_user.png cr32-action-search_user.png cr48-action-voicecall.png cr64-action-webcamreceive.png cr16-action-webcamreceive.png hi48-action-kopeteaway.png hi16-action-status_unknown.png cr16-action-contact_invisible_overlay.png cr16-action-show_offliners.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png cr64-action-voicecall.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr22-action-search_user.png cr16-action-kopeteaway.png cr48-action-kopeteaway.png cr16-action-account_offline_overlay.png Makefile.am cr16-action-search_user.png hi32-action-kopeteaway.png
#>+ 2
docs-am:
- #>+ 105
+ #>+ 185
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
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteavailable.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteaway.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-emoticon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emoticon.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_online.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_away_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kopeteaway.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++ $(INSTALL_DATA) $(srcdir)/cr64-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/voicecall.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_offline.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/kopeteavailable.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/kopeteavailable.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
+- $(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_phone_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmessage.mng
+- $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/kopeteavailable.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/newmsg.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/voicecall.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-account_offline_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_invisible_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/account_offline_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/account_offline_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-status_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/status_unknown.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_food_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_food_overlay.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_online.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_offline.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteeditstatusmessage.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteeditstatusmessage.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamreceive.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/hi16-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteaway.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/webcamreceive.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-account_offline_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/account_offline_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-delete_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/delete_user.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_online.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_offline.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-emoticon.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/emoticon.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_unknown.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_unknown.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_away.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_xa_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteaway.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-add_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add_user.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-edit_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit_user.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamreceive.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-emoticon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emoticon.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-delete_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/delete_user.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_away.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteavailable.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-newmessage.mng $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/newmessage.mng
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteavailable.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-show_offliners.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_offliners.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kopeteavailable.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmsg.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-contact_busy_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newmsg.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-search_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/search_user.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_away.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/webcamsend.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/voicecall.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/voicecall.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-show_offliners.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_offliners.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteaway.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/webcamsend.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
++ $(INSTALL_DATA) $(srcdir)/cr128-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/voicecall.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamsend.png
+ $(INSTALL_DATA) $(srcdir)/cr128-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/webcamsend.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-add_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add_user.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamreceive.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-delete_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/delete_user.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-delete_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/delete_user.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown_overlay.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-delete_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/delete_user.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/webcamreceive.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-status_unknown_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/status_unknown_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_xa_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_phone_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_offline.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-add_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add_user.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamsend.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi32-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newmsg.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-status_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/status_unknown.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_online.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_invisible_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_busy_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/kopeteavailable.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/webcamreceive.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamsend.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kopetestatusmessage.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopetestatusmessage.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/kopeteaway.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/webcamreceive.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-edit_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit_user.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-add_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add_user.png
+- $(INSTALL_DATA) $(srcdir)/cr128-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/voicecall.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-show_offliners.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_offliners.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/voicecall.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteeditstatusmessage.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteeditstatusmessage.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteeditstatusmessage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteeditstatusmessage.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamsend.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_online.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_unknown.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteaway.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-delete_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/delete_user.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteaway.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_offline.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
++ $(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteaway.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kopeteeditstatusmessage.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteeditstatusmessage.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/webcamsend.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-add_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add_user.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/newmsg.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-add_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add_user.png
+ $(INSTALL_DATA) $(srcdir)/cr128-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/webcamreceive.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-webcamreceive.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamreceive.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteeditstatusmessage.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteeditstatusmessage.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_away.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-search_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/search_user.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kopetestatusmessage.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopetestatusmessage.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-edit_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit_user.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/account_offline_overlay.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/webcamsend.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-edit_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit_user.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-search_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/search_user.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-search_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/search_user.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-webcamsend.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/webcamsend.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-edit_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit_user.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-edit_user.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit_user.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmsg.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown_overlay.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown_overlay.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-newmessage.mng $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/newmessage.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_away_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-contact_food_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_food_overlay.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/voicecall.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmessage.mng
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kopeteavailable.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteavailable.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_unknown.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-show_offliners.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_offliners.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/voicecall.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/voicecall.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-status_unknown_overlay.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/status_unknown_overlay.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/voicecall.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-voicecall.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/voicecall.png
++ $(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kde_icondir)/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
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/voicecall.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/voicecall.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteeditstatusmessage.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamreceive.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/webcamreceive.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/account_offline_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/delete_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/emoticon.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamreceive.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emoticon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_online.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_away_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_offline.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/delete_user.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_offliners.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_offline.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/search_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/webcamsend.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/voicecall.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/voicecall.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_offliners.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/voicecall.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamsend.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/webcamsend.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/status_unknown_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_phone_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmessage.mng
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/newmsg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/account_offline_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_offline.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamsend.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newmsg.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/status_unknown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_food_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_invisible_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/webcamreceive.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopetestatusmessage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/webcamreceive.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_online.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_offline.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_online.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/metacontact_offline.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/emoticon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kopeteaway.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_unknown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/metacontact_away.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_unknown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_away.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_xa_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/newmessage.mng
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/kopeteavailable.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmsg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_busy_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newmsg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/show_offliners.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteaway.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/webcamsend.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/webcamsend.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamreceive.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/delete_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/delete_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown_overlay.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/delete_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/webcamreceive.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/webcamreceive.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/webcamsend.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/webcamreceive.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/add_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/voicecall.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/show_offliners.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/voicecall.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteeditstatusmessage.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteeditstatusmessage.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamsend.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteaway.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_offline.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kopeteaway.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteeditstatusmessage.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/webcamsend.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/add_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/newmsg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/add_user.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/webcamreceive.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/webcamreceive.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteeditstatusmessage.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_away.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/search_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopetestatusmessage.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/account_offline_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/webcamsend.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit_user.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/search_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/search_user.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/webcamsend.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/edit_user.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edit_user.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmsg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/status_unknown_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/newmessage.mng
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_away_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contact_food_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/voicecall.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newmessage.mng
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kopeteavailable.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/metacontact_unknown.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/show_offliners.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/voicecall.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/voicecall.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/status_unknown_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/voicecall.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/voicecall.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/kopeteaway.png
#>+ 15
force-reedit:
--- kopete/kopete/addaccountwizard/Makefile.in
+++ kopete/kopete/addaccountwizard/Makefile.in
-@@ -139,6 +139,7 @@
+@@ -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@
-@@ -235,6 +236,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -237,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55787,7 +57679,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -278,6 +282,7 @@
+@@ -284,6 +288,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55795,7 +57687,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -289,12 +294,9 @@
+@@ -295,12 +300,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -55808,9 +57700,9 @@
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@
+@@ -321,10 +323,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -55822,7 +57714,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -325,6 +330,7 @@
+@@ -333,6 +338,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -55830,7 +57722,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -401,12 +407,15 @@
+@@ -413,12 +419,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -55846,7 +57738,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -443,7 +452,7 @@
+@@ -455,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55855,7 +57747,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +490,9 @@
+@@ -493,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55869,15 +57761,15 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/addcontactwizard/Makefile.in
+++ kopete/kopete/addcontactwizard/Makefile.in
-@@ -140,6 +140,7 @@
+@@ -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@
-@@ -236,6 +237,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -238,6 +239,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55887,7 +57779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -279,6 +283,7 @@
+@@ -285,6 +289,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55895,7 +57787,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -290,12 +295,9 @@
+@@ -296,12 +301,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -55908,9 +57800,9 @@
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@
+@@ -322,10 +324,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -55922,7 +57814,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -326,6 +331,7 @@
+@@ -334,6 +339,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -55930,7 +57822,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -402,12 +408,15 @@
+@@ -414,12 +420,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -55946,7 +57838,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -444,7 +453,7 @@
+@@ -456,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -55955,7 +57847,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +491,9 @@
+@@ -494,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -55969,15 +57861,15 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/chatwindow/Makefile.in
+++ kopete/kopete/chatwindow/Makefile.in
-@@ -180,6 +180,7 @@
+@@ -191,6 +191,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -286,6 +287,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -55987,7 +57879,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,6 +323,7 @@
+@@ -333,6 +337,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -55995,7 +57887,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -330,12 +335,9 @@
+@@ -344,12 +349,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56008,9 +57900,9 @@
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@
+@@ -370,10 +372,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56022,7 +57914,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -366,6 +371,7 @@
+@@ -382,6 +387,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56030,7 +57922,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -442,12 +448,15 @@
+@@ -462,12 +468,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56046,7 +57938,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -499,7 +508,7 @@
+@@ -524,7 +533,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56055,7 +57947,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +546,9 @@
+@@ -562,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56067,7 +57959,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -922,11 +931,11 @@
+@@ -970,11 +979,11 @@
mocs: kopeteemailwindow.moc
#>+ 3
@@ -56082,7 +57974,7 @@
#>+ 3
kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
-@@ -936,11 +945,11 @@
+@@ -984,11 +993,11 @@
mocs: kopetechatwindow.moc
#>+ 3
@@ -56097,35 +57989,145 @@
#>+ 8
kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
-@@ -962,7 +971,7 @@
+@@ -1019,7 +1028,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
+- -rm -f kopetechatwindowstylemanager.moc krichtexteditpart.moc emoticonselector.moc chattexteditpart.moc chatmessagepart.moc chatview.moc kopeteemailwindow.moc chatmemberslistwidget.moc kopetechatwindow.moc kopeteemoticonaction.moc
++ -rm -f kopetechatwindowstylemanager.moc 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 +1022,7 @@
+ KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h krichtexteditpart.h kopetechatwindowstyle.h chatmessagepart.h emailwindow.desktop kopetechatwindowstylemanager.h chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc kopeteemailwindow.h Makefile.am
+@@ -1070,7 +1079,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
+-kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp chatview.moc kopetechatwindow.moc chatmemberslistwidget.moc
++kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp chatview.moc chatmemberslistwidget.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; \
+@@ -1128,8 +1137,8 @@
+ chatview.o: chatview.moc
+ kopetechatwindowstylemanager.lo: kopetechatwindowstylemanager.moc
+ nmcheck:
+-kopetechatwindow.lo: kopetechatwindow.moc
+ chatmemberslistwidget.lo: chatmemberslistwidget.moc
++kopetechatwindow.lo: kopetechatwindow.moc
+ kopeteemailwindow.lo: kopeteemailwindow.moc
+ chatmessagepart.o: chatmessagepart.moc
+ nmcheck-am: nmcheck
+--- kopete/kopete/chatwindow/tests/Makefile.in
++++ kopete/kopete/chatwindow/tests/Makefile.in
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -248,6 +249,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -332,10 +334,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -469,7 +478,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -507,9 +516,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-checkLTLIBRARIES:
--- kopete/kopete/config/accounts/Makefile.in
+++ kopete/kopete/config/accounts/Makefile.in
-@@ -150,6 +150,7 @@
+@@ -153,6 +153,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -248,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56135,7 +58137,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -289,6 +293,7 @@
+@@ -295,6 +299,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56143,7 +58145,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -300,12 +305,9 @@
+@@ -306,12 +311,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56156,9 +58158,9 @@
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@
+@@ -332,10 +334,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56170,7 +58172,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -336,6 +341,7 @@
+@@ -344,6 +349,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56178,7 +58180,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -412,12 +418,15 @@
+@@ -424,12 +430,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56194,7 +58196,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -457,7 +466,7 @@
+@@ -469,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56203,7 +58205,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -495,9 +504,9 @@
+@@ -507,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56217,15 +58219,15 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/config/appearance/Makefile.in
+++ kopete/kopete/config/appearance/Makefile.in
-@@ -151,6 +151,7 @@
+@@ -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@
-@@ -247,6 +248,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -251,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56235,7 +58237,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +294,7 @@
+@@ -298,6 +302,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56243,7 +58245,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -301,12 +306,9 @@
+@@ -309,12 +314,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56256,9 +58258,9 @@
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@
+@@ -335,10 +337,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56270,7 +58272,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -337,6 +342,7 @@
+@@ -347,6 +352,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56278,7 +58280,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -413,12 +419,15 @@
+@@ -427,12 +433,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56294,7 +58296,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -468,7 +477,7 @@
+@@ -483,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56303,7 +58305,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +515,9 @@
+@@ -521,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56317,15 +58319,15 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/config/avdevice/Makefile.in
+++ kopete/kopete/config/avdevice/Makefile.in
-@@ -154,6 +154,7 @@
+@@ -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@
-@@ -250,6 +251,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -252,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56335,7 +58337,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -293,6 +297,7 @@
+@@ -299,6 +303,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56343,7 +58345,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -304,12 +309,9 @@
+@@ -310,12 +315,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56356,9 +58358,9 @@
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@
+@@ -336,10 +338,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56370,7 +58372,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -340,6 +345,7 @@
+@@ -348,6 +353,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56378,7 +58380,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -416,12 +422,15 @@
+@@ -428,12 +434,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56394,7 +58396,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -473,7 +482,7 @@
+@@ -485,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56403,7 +58405,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +520,9 @@
+@@ -523,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56415,7 +58417,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -829,20 +838,20 @@
+@@ -841,20 +850,20 @@
#>+ 16
install-kde-icons:
@@ -56444,15 +58446,15 @@
force-reedit:
--- kopete/kopete/config/behavior/Makefile.in
+++ kopete/kopete/config/behavior/Makefile.in
-@@ -149,6 +149,7 @@
+@@ -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@
-@@ -245,6 +246,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -247,6 +248,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56462,7 +58464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -288,6 +292,7 @@
+@@ -294,6 +298,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56470,7 +58472,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -299,12 +304,9 @@
+@@ -305,12 +310,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56483,9 +58485,9 @@
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@
+@@ -331,10 +333,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56497,7 +58499,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -335,6 +340,7 @@
+@@ -343,6 +348,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56505,7 +58507,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -411,12 +417,15 @@
+@@ -423,12 +429,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56521,7 +58523,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -461,7 +470,7 @@
+@@ -473,7 +482,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56530,7 +58532,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +508,9 @@
+@@ -511,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56542,7 +58544,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -800,7 +809,7 @@
+@@ -812,7 +821,7 @@
-rm -f behaviorconfig.moc
#>+ 2
@@ -56553,15 +58555,15 @@
clean-ui:
--- kopete/kopete/config/identity/Makefile.in
+++ kopete/kopete/config/identity/Makefile.in
-@@ -152,6 +152,7 @@
+@@ -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@
-@@ -248,6 +249,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -250,6 +251,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56571,7 +58573,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -291,6 +295,7 @@
+@@ -297,6 +301,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56579,7 +58581,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -302,12 +307,9 @@
+@@ -308,12 +313,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56592,9 +58594,9 @@
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@
+@@ -334,10 +336,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56606,7 +58608,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -338,6 +343,7 @@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56614,7 +58616,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -414,12 +420,15 @@
+@@ -426,12 +432,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56630,7 +58632,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -463,7 +472,7 @@
+@@ -475,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56639,7 +58641,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +510,9 @@
+@@ -513,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56651,7 +58653,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -809,22 +818,22 @@
+@@ -821,22 +830,22 @@
#>+ 3
@@ -56681,7 +58683,7 @@
#>+ 2
KDE_DIST=globalidentitiesmanager.h kopeteidentityconfigbase.ui kopeteidentityconfigpreferences.kcfgc kopeteidentityconfig.h kopeteidentityconfigpreferences.kcfg Makefile.in kopete_identityconfig.desktop Makefile.am
-@@ -885,7 +894,7 @@
+@@ -897,7 +906,7 @@
#>+ 11
@@ -56692,15 +58694,15 @@
echo "#define KDE_USE_FINAL 1" >> kcm_kopete_identityconfig_la.all_cpp.final; \
--- kopete/kopete/config/Makefile.in
+++ kopete/kopete/config/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56710,7 +58712,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56718,7 +58720,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56731,9 +58733,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56745,7 +58747,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56753,7 +58755,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56769,7 +58771,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -56778,7 +58780,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56792,15 +58794,15 @@
mostlyclean-libtool:
--- kopete/kopete/config/plugins/Makefile.in
+++ kopete/kopete/config/plugins/Makefile.in
-@@ -132,6 +132,7 @@
+@@ -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@
-@@ -228,6 +229,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -230,6 +231,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56810,7 +58812,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -271,6 +275,7 @@
+@@ -277,6 +281,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56818,7 +58820,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -282,12 +287,9 @@
+@@ -288,12 +293,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56831,9 +58833,9 @@
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@
+@@ -314,10 +316,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56845,7 +58847,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -318,6 +323,7 @@
+@@ -326,6 +331,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56853,7 +58855,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -394,12 +400,15 @@
+@@ -406,12 +412,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56869,7 +58871,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -431,7 +440,7 @@
+@@ -443,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56878,7 +58880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +478,9 @@
+@@ -481,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56892,15 +58894,15 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/contactlist/Makefile.in
+++ kopete/kopete/contactlist/Makefile.in
-@@ -145,6 +145,7 @@
+@@ -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@
-@@ -241,6 +242,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -243,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -56910,7 +58912,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -284,6 +288,7 @@
+@@ -290,6 +294,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -56918,7 +58920,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -295,12 +300,9 @@
+@@ -301,12 +306,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -56931,9 +58933,9 @@
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@
+@@ -327,10 +329,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -56945,7 +58947,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -331,6 +336,7 @@
+@@ -339,6 +344,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -56953,7 +58955,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -407,12 +413,15 @@
+@@ -419,12 +425,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -56969,7 +58971,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -467,7 +476,7 @@
+@@ -479,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -56978,7 +58980,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +514,9 @@
+@@ -517,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -56990,7 +58992,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -746,18 +755,18 @@
+@@ -758,18 +767,18 @@
.NOEXPORT:
#>+ 3
@@ -57015,7 +59017,7 @@
#>+ 3
kopetelviprops.moc: $(srcdir)/kopetelviprops.h
-@@ -774,18 +783,18 @@
+@@ -786,18 +795,18 @@
mocs: kopetecontactlistview.moc
#>+ 3
@@ -57040,7 +59042,7 @@
#>+ 3
kabcexport.moc: $(srcdir)/kabcexport.h
-@@ -796,10 +805,10 @@
+@@ -808,10 +817,10 @@
#>+ 3
clean-metasources:
@@ -57055,15 +59057,15 @@
clean-ui:
--- kopete/kopete/kconf_update/Makefile.in
+++ kopete/kopete/kconf_update/Makefile.in
-@@ -171,6 +171,7 @@
+@@ -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@
-@@ -267,6 +268,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -269,6 +270,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57073,7 +59075,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -310,6 +314,7 @@
+@@ -316,6 +320,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57081,7 +59083,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -321,12 +326,9 @@
+@@ -327,12 +332,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -57094,9 +59096,9 @@
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@
+@@ -353,10 +355,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -57108,7 +59110,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -357,6 +362,7 @@
+@@ -365,6 +370,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -57116,7 +59118,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -433,12 +439,15 @@
+@@ -445,12 +451,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -57132,7 +59134,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -484,7 +493,7 @@
+@@ -496,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57141,7 +59143,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +531,9 @@
+@@ -534,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57155,15 +59157,15 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/Makefile.in
+++ kopete/kopete/Makefile.in
-@@ -177,6 +177,7 @@
+@@ -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@
-@@ -273,6 +274,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -275,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57173,7 +59175,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -316,6 +320,7 @@
+@@ -322,6 +326,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57181,7 +59183,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -327,12 +332,9 @@
+@@ -333,12 +338,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -57194,9 +59196,9 @@
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@
+@@ -359,10 +361,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -57208,7 +59210,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -363,6 +368,7 @@
+@@ -371,6 +376,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -57216,7 +59218,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -439,12 +445,15 @@
+@@ -451,12 +457,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -57232,7 +59234,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -519,7 +528,7 @@
+@@ -533,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57241,7 +59243,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +566,9 @@
+@@ -571,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57253,7 +59255,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1007,18 +1016,18 @@
+@@ -1021,18 +1030,18 @@
mocs: kopetewindow.moc
#>+ 3
@@ -57278,7 +59280,7 @@
#>+ 3
kopeteeditglobalidentitywidget.moc: $(srcdir)/kopeteeditglobalidentitywidget.h
-@@ -1043,10 +1052,10 @@
+@@ -1057,10 +1066,10 @@
#>+ 3
clean-metasources:
@@ -57286,12 +59288,12 @@
+ -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
+-KDE_DIST=groupkabcselectorwidget.ui 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=groupkabcselectorwidget.ui 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 +1069,43 @@
+@@ -1079,43 +1088,43 @@
#>+ 40
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
@@ -57356,26 +59358,26 @@
#>+ 15
force-reedit:
-@@ -1137,7 +1146,7 @@
+@@ -1156,7 +1165,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
+-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 groupkabcselectorwidget.cpp kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc kopeteeditglobalidentitywidget.moc systemtray.moc groupkabcselectorwidget.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 groupkabcselectorwidget.cpp kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc kopeteeditglobalidentitywidget.moc systemtray.moc groupkabcselectorwidget.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
-@@ -159,6 +159,7 @@
+@@ -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@
-@@ -255,6 +256,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -257,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57385,7 +59387,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -298,6 +302,7 @@
+@@ -304,6 +308,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57393,7 +59395,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -309,12 +314,9 @@
+@@ -315,12 +320,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -57406,9 +59408,9 @@
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@
+@@ -341,10 +343,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -57420,7 +59422,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -345,6 +350,7 @@
+@@ -353,6 +358,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -57428,7 +59430,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -421,12 +427,15 @@
+@@ -433,12 +439,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -57444,7 +59446,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -472,7 +481,7 @@
+@@ -484,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57453,7 +59455,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +519,9 @@
+@@ -522,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57465,17 +59467,117 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- kopete/libkopete/compat/Makefile.in
++++ kopete/libkopete/compat/Makefile.in
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -235,6 +236,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -319,10 +321,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -450,7 +459,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -488,9 +497,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
--- kopete/libkopete/Makefile.in
+++ kopete/libkopete/Makefile.in
-@@ -216,6 +216,7 @@
+@@ -223,6 +223,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -318,6 +319,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57485,7 +59587,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -355,6 +359,7 @@
+@@ -365,6 +369,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57493,7 +59595,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -366,12 +371,9 @@
+@@ -376,12 +381,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -57506,9 +59608,9 @@
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@
+@@ -402,10 +404,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -57520,7 +59622,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -402,6 +407,7 @@
+@@ -414,6 +419,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -57528,7 +59630,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -478,12 +484,15 @@
+@@ -494,12 +500,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -57544,7 +59646,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -580,7 +589,7 @@
+@@ -590,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57553,7 +59655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +627,9 @@
+@@ -628,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57565,7 +59667,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1226,18 +1235,18 @@
+@@ -1240,18 +1249,18 @@
mocs: kopeteaccount.moc
#>+ 3
@@ -57590,7 +59692,7 @@
#>+ 3
kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
-@@ -1254,18 +1263,18 @@
+@@ -1268,18 +1277,18 @@
mocs: kopetecommandhandler.moc
#>+ 3
@@ -57615,7 +59717,7 @@
#>+ 3
kautoconfig.moc: $(srcdir)/kautoconfig.h
-@@ -1373,18 +1382,18 @@
+@@ -1387,18 +1396,18 @@
mocs: kopeteplugin.moc
#>+ 3
@@ -57639,36 +59741,61 @@
+mocs: kopetesimplemessagehandler.moc
#>+ 3
- kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
-@@ -1451,7 +1460,7 @@
+ kopeteprefs.moc: $(srcdir)/kopeteprefs.h
+@@ -1408,18 +1417,18 @@
+ mocs: kopeteprefs.moc
#>+ 3
+-kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
+- $(MOC) $(srcdir)/kopetecontactlist.h -o kopetecontactlist.moc
++webcamwidget.moc: $(srcdir)/webcamwidget.h
++ $(MOC) $(srcdir)/webcamwidget.h -o webcamwidget.moc
+
+ #>+ 2
+-mocs: kopetecontactlist.moc
++mocs: webcamwidget.moc
+
+ #>+ 3
+-webcamwidget.moc: $(srcdir)/webcamwidget.h
+- $(MOC) $(srcdir)/webcamwidget.h -o webcamwidget.moc
++kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
++ $(MOC) $(srcdir)/kopetecontactlist.h -o kopetecontactlist.moc
+
+ #>+ 2
+-mocs: webcamwidget.moc
++mocs: kopetecontactlist.moc
+
+ #>+ 3
+ knotification.moc: $(srcdir)/knotification.h
+@@ -1479,7 +1488,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
+- -rm -f 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 kopeteprefs.moc kopetecontactlist.moc webcamwidget.moc knotification.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemetacontact.moc
++ -rm -f 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 kopeteprefs.moc webcamwidget.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 +1522,7 @@
+@@ -1541,7 +1550,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
+-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)/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 $(srcdir)/kopeteprefs.cpp $(srcdir)/kopetepicture.cpp $(srcdir)/webcamwidget.cpp connectionmanager_skel.cpp clientiface_stub.cpp kopeteconfig.cpp kopeteaccount.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 webcamwidget.moc kopetecontactlist.moc kopeteprefs.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)/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 $(srcdir)/kopeteprefs.cpp $(srcdir)/kopetepicture.cpp $(srcdir)/webcamwidget.cpp connectionmanager_skel.cpp clientiface_stub.cpp kopeteconfig.cpp kopeteaccount.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 webcamwidget.moc kopeteprefs.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
-@@ -136,6 +136,7 @@
+@@ -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@
-@@ -232,6 +233,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -234,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57678,7 +59805,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -275,6 +279,7 @@
+@@ -281,6 +285,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57686,7 +59813,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -286,12 +291,9 @@
+@@ -292,12 +297,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -57699,9 +59826,9 @@
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@
+@@ -318,10 +320,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -57713,7 +59840,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -322,6 +327,7 @@
+@@ -330,6 +335,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -57721,7 +59848,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -398,12 +404,15 @@
+@@ -410,12 +416,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -57737,7 +59864,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -439,7 +448,7 @@
+@@ -451,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57746,7 +59873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +486,9 @@
+@@ -489,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57758,26 +59885,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -752,7 +761,7 @@
- -rm -f kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc kopeteutils_private.moc
+@@ -756,7 +765,7 @@
+ -rm -f kopeteviewmanager.moc kopeteemoticons.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
+-KDE_DIST=kopetecommand.h kopeteemoticons.h kopeteutils_private.h Makefile.in Makefile.am kopeteviewmanager.h
++KDE_DIST=kopetecommand.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
-@@ -208,6 +208,7 @@
+@@ -201,6 +201,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -296,6 +297,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57787,7 +59914,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -343,6 +347,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57795,7 +59922,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -358,12 +363,9 @@
+@@ -354,12 +359,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -57808,9 +59935,9 @@
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@
+@@ -380,10 +382,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -57822,7 +59949,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -394,6 +399,7 @@
+@@ -392,6 +397,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -57830,7 +59957,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -470,12 +476,15 @@
+@@ -472,12 +478,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -57846,7 +59973,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -530,7 +539,7 @@
+@@ -529,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57855,7 +59982,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +577,9 @@
+@@ -567,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57869,15 +59996,15 @@
clean-checkLTLIBRARIES:
--- kopete/libkopete/tests/mock/Makefile.in
+++ kopete/libkopete/tests/mock/Makefile.in
-@@ -143,6 +143,7 @@
+@@ -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@
-@@ -239,6 +240,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -240,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57887,7 +60014,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -282,6 +286,7 @@
+@@ -287,6 +291,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57895,7 +60022,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -293,12 +298,9 @@
+@@ -298,12 +303,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -57908,9 +60035,9 @@
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@
+@@ -324,10 +326,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -57922,7 +60049,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -329,6 +334,7 @@
+@@ -336,6 +341,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -57930,7 +60057,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -405,12 +411,15 @@
+@@ -416,12 +422,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -57946,7 +60073,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -445,7 +454,7 @@
+@@ -456,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -57955,7 +60082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +492,9 @@
+@@ -494,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -57969,15 +60096,15 @@
clean-noinstLTLIBRARIES:
--- kopete/libkopete/ui/Makefile.in
+++ kopete/libkopete/ui/Makefile.in
-@@ -161,6 +161,7 @@
+@@ -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@
-@@ -257,6 +258,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -260,6 +261,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -57987,7 +60114,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -300,6 +304,7 @@
+@@ -307,6 +311,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -57995,7 +60122,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -311,12 +316,9 @@
+@@ -318,12 +323,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58008,9 +60135,9 @@
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@
+@@ -344,10 +346,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58022,7 +60149,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -347,6 +352,7 @@
+@@ -356,6 +361,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58030,7 +60157,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -423,12 +429,15 @@
+@@ -436,12 +442,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58046,7 +60173,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -487,7 +496,7 @@
+@@ -503,7 +512,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58055,7 +60182,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +534,9 @@
+@@ -541,9 +550,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58067,7 +60194,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -859,18 +868,18 @@
+@@ -883,18 +892,18 @@
mocs: kopetelistviewitem.moc
#>+ 3
@@ -58092,26 +60219,26 @@
#>+ 3
addressbookselectorwidget.moc: $(srcdir)/addressbookselectorwidget.h
-@@ -895,7 +904,7 @@
+@@ -919,7 +928,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
+- -rm -f userinfodialog.moc addressbookselectordialog.moc contactaddednotifydialog.moc kopetelistview.moc kopetecontactaction.moc addcontactpage.moc kopetestdaction.moc kopetepasswordwidget.moc addressbooklinkwidget.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 addressbooklinkwidget.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
+ KDE_DIST=contactaddednotifywidget.ui kopetewidgets.cpp fileconfirmbase.ui kopete.widgets addressbookselectorwidget_base.ui metacontactselectorwidget.h contactaddednotifydialog.h widgets.cw addressbooklinkwidget_base.ui kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui metacontactselectorwidget_base.ui Makefile.in kopetepassworddialog.ui Makefile.am
--- kopete/Makefile.in
+++ kopete/Makefile.in
-@@ -118,6 +118,7 @@
+@@ -121,6 +121,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -216,6 +217,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58121,7 +60248,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -257,6 +261,7 @@
+@@ -263,6 +267,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58129,7 +60256,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -268,12 +273,9 @@
+@@ -274,12 +279,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58142,9 +60269,9 @@
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@
+@@ -300,10 +302,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58156,7 +60283,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -304,6 +309,7 @@
+@@ -312,6 +317,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58164,7 +60291,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -380,12 +386,15 @@
+@@ -392,12 +398,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58180,7 +60307,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -412,7 +421,7 @@
+@@ -424,7 +433,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -58189,7 +60316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +459,9 @@
+@@ -462,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58203,15 +60330,15 @@
mostlyclean-libtool:
--- kopete/plugins/addbookmarks/Makefile.in
+++ kopete/plugins/addbookmarks/Makefile.in
-@@ -166,6 +166,7 @@
+@@ -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@
-@@ -262,6 +263,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -264,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58221,7 +60348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -305,6 +309,7 @@
+@@ -311,6 +315,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58229,7 +60356,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -316,12 +321,9 @@
+@@ -322,12 +327,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58242,9 +60369,9 @@
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@
+@@ -348,10 +350,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58256,7 +60383,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -352,6 +357,7 @@
+@@ -360,6 +365,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58264,7 +60391,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -428,12 +434,15 @@
+@@ -440,12 +446,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58280,7 +60407,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -484,7 +493,7 @@
+@@ -496,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58289,7 +60416,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +531,9 @@
+@@ -534,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58303,15 +60430,15 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/alias/Makefile.in
+++ kopete/plugins/alias/Makefile.in
-@@ -156,6 +156,7 @@
+@@ -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@
-@@ -252,6 +253,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -254,6 +255,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58321,7 +60448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -295,6 +299,7 @@
+@@ -301,6 +305,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58329,7 +60456,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -306,12 +311,9 @@
+@@ -312,12 +317,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58342,9 +60469,9 @@
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@
+@@ -338,10 +340,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58356,7 +60483,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -342,6 +347,7 @@
+@@ -350,6 +355,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58364,7 +60491,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -418,12 +424,15 @@
+@@ -430,12 +436,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58380,7 +60507,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -468,7 +477,7 @@
+@@ -480,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58389,7 +60516,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +515,9 @@
+@@ -518,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58401,7 +60528,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -820,18 +829,18 @@
+@@ -832,18 +841,18 @@
#>+ 3
@@ -58426,7 +60553,7 @@
#>+ 3
editaliasdialog.moc: $(srcdir)/editaliasdialog.h
-@@ -851,10 +860,10 @@
+@@ -863,10 +872,10 @@
#>+ 3
clean-metasources:
@@ -58439,7 +60566,7 @@
#>+ 5
clean-ui:
-@@ -945,8 +954,8 @@
+@@ -957,8 +966,8 @@
#>+ 11
nmcheck:
@@ -58451,15 +60578,15 @@
aliasplugin.lo: aliasplugin.moc
--- kopete/plugins/autoreplace/icons/Makefile.in
+++ kopete/plugins/autoreplace/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58469,7 +60596,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58477,7 +60604,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58490,9 +60617,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58504,7 +60631,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58512,7 +60639,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58528,7 +60655,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -58537,7 +60664,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58551,15 +60678,15 @@
mostlyclean-libtool:
--- kopete/plugins/autoreplace/Makefile.in
+++ kopete/plugins/autoreplace/Makefile.in
-@@ -177,6 +177,7 @@
+@@ -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@
-@@ -273,6 +274,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -275,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58569,7 +60696,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -316,6 +320,7 @@
+@@ -322,6 +326,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58577,7 +60704,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -327,12 +332,9 @@
+@@ -333,12 +338,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58590,9 +60717,9 @@
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@
+@@ -359,10 +361,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58604,7 +60731,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -363,6 +368,7 @@
+@@ -371,6 +376,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58612,7 +60739,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -439,12 +445,15 @@
+@@ -451,12 +457,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58628,7 +60755,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -490,7 +499,7 @@
+@@ -502,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58637,7 +60764,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +537,9 @@
+@@ -540,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58651,15 +60778,15 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/connectionstatus/Makefile.in
+++ kopete/plugins/connectionstatus/Makefile.in
-@@ -144,6 +144,7 @@
+@@ -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@
-@@ -240,6 +241,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -242,6 +243,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58669,7 +60796,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -283,6 +287,7 @@
+@@ -289,6 +293,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58677,7 +60804,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -294,12 +299,9 @@
+@@ -300,12 +305,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58690,9 +60817,9 @@
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@
+@@ -326,10 +328,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58704,7 +60831,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -330,6 +335,7 @@
+@@ -338,6 +343,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58712,7 +60839,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -406,12 +412,15 @@
+@@ -418,12 +424,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58728,7 +60855,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -445,7 +454,7 @@
+@@ -457,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58737,7 +60864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +492,9 @@
+@@ -495,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58751,15 +60878,15 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/contactnotes/Makefile.in
+++ kopete/plugins/contactnotes/Makefile.in
-@@ -148,6 +148,7 @@
+@@ -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@
-@@ -244,6 +245,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -246,6 +247,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58769,7 +60896,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -287,6 +291,7 @@
+@@ -293,6 +297,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58777,7 +60904,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -298,12 +303,9 @@
+@@ -304,12 +309,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58790,9 +60917,9 @@
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@
+@@ -330,10 +332,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58804,7 +60931,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -334,6 +339,7 @@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58812,7 +60939,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -410,12 +416,15 @@
+@@ -422,12 +428,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58828,7 +60955,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -453,7 +462,7 @@
+@@ -465,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -58837,7 +60964,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +500,9 @@
+@@ -503,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58851,15 +60978,15 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/cryptography/icons/Makefile.in
+++ kopete/plugins/cryptography/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58869,7 +60996,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58877,7 +61004,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58890,9 +61017,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -58904,7 +61031,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -58912,7 +61039,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -58928,7 +61055,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -58937,7 +61064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58951,15 +61078,15 @@
mostlyclean-libtool:
--- kopete/plugins/cryptography/Makefile.in
+++ kopete/plugins/cryptography/Makefile.in
-@@ -180,6 +180,7 @@
+@@ -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@
-@@ -276,6 +277,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -278,6 +279,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -58969,7 +61096,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -319,6 +323,7 @@
+@@ -325,6 +329,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -58977,7 +61104,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -330,12 +335,9 @@
+@@ -336,12 +341,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -58990,9 +61117,9 @@
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@
+@@ -362,10 +364,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59004,7 +61131,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -366,6 +371,7 @@
+@@ -374,6 +379,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59012,7 +61139,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -442,12 +448,15 @@
+@@ -454,12 +460,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59028,7 +61155,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -497,7 +506,7 @@
+@@ -509,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59037,7 +61164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +544,9 @@
+@@ -547,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59049,7 +61176,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -977,6 +986,13 @@
+@@ -989,6 +998,13 @@
#>+ 3
@@ -59063,7 +61190,7 @@
kgpginterface.moc: $(srcdir)/kgpginterface.h
$(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
-@@ -984,11 +1000,11 @@
+@@ -996,11 +1012,11 @@
mocs: kgpginterface.moc
#>+ 3
@@ -59078,7 +61205,7 @@
#>+ 3
kgpgselkey.moc: $(srcdir)/kgpgselkey.h
-@@ -1005,13 +1021,6 @@
+@@ -1017,13 +1033,6 @@
mocs: popuppublic.moc
#>+ 3
@@ -59092,7 +61219,7 @@
cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
$(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
-@@ -1036,7 +1045,7 @@
+@@ -1048,7 +1057,7 @@
#>+ 3
clean-metasources:
@@ -59101,7 +61228,7 @@
#>+ 2
KDE_DIST=cryptographychatui.rc kopete_cryptography.desktop cryptographyguiclient.h kgpginterface.h cryptographyuserkey_ui.ui kgpgselkey.h kopete_cryptography_config.desktop cryptographyselectuserkey.h Makefile.in cryptographypreferences.h cryptographyplugin.h cryptographyui.rc cryptographyprefsbase.ui Makefile.am popuppublic.h
-@@ -1105,7 +1114,7 @@
+@@ -1117,7 +1126,7 @@
rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
#>+ 11
@@ -59112,15 +61239,15 @@
echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
--- kopete/plugins/highlight/icons/Makefile.in
+++ kopete/plugins/highlight/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59130,7 +61257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59138,7 +61265,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59151,9 +61278,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59165,7 +61292,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59173,7 +61300,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59189,7 +61316,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -59198,7 +61325,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59212,15 +61339,15 @@
mostlyclean-libtool:
--- kopete/plugins/highlight/Makefile.in
+++ kopete/plugins/highlight/Makefile.in
-@@ -177,6 +177,7 @@
+@@ -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@
-@@ -273,6 +274,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -275,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59230,7 +61357,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -316,6 +320,7 @@
+@@ -322,6 +326,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59238,7 +61365,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -327,12 +332,9 @@
+@@ -333,12 +338,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59251,9 +61378,9 @@
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@
+@@ -359,10 +361,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59265,7 +61392,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -363,6 +368,7 @@
+@@ -371,6 +376,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59273,7 +61400,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -439,12 +445,15 @@
+@@ -451,12 +457,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59289,7 +61416,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -490,7 +499,7 @@
+@@ -502,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59298,7 +61425,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +537,9 @@
+@@ -540,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59310,7 +61437,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -975,7 +984,7 @@
+@@ -987,7 +996,7 @@
-rm -f highlightpreferences.moc highlightplugin.moc
#>+ 2
@@ -59321,15 +61448,15 @@
clean-ui:
--- kopete/plugins/history/Makefile.in
+++ kopete/plugins/history/Makefile.in
-@@ -163,6 +163,7 @@
+@@ -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@
-@@ -259,6 +260,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -261,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59339,7 +61466,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,6 +306,7 @@
+@@ -308,6 +312,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59347,7 +61474,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -313,12 +318,9 @@
+@@ -319,12 +324,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59360,9 +61487,9 @@
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@
+@@ -345,10 +347,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59374,7 +61501,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -349,6 +354,7 @@
+@@ -357,6 +362,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59382,7 +61509,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -425,12 +431,15 @@
+@@ -437,12 +443,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59398,7 +61525,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -483,7 +492,7 @@
+@@ -495,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59407,7 +61534,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +530,9 @@
+@@ -533,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59419,7 +61546,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -877,18 +886,18 @@
+@@ -889,18 +898,18 @@
#>+ 3
@@ -59444,7 +61571,7 @@
#>+ 3
historylogger.moc: $(srcdir)/historylogger.h
-@@ -922,7 +931,7 @@
+@@ -934,7 +943,7 @@
#>+ 3
clean-metasources:
@@ -59453,7 +61580,7 @@
#>+ 2
KDE_DIST=historyprefsui.ui historyviewer.ui historypreferences.h historyconfig.kcfgc kopete_history_config.desktop historyui.rc historyguiclient.h kopete_history.desktop historyplugin.h historylogger.h historyconfig.kcfg Makefile.in historychatui.rc Makefile.am historydialog.h
-@@ -997,7 +1006,7 @@
+@@ -1009,7 +1018,7 @@
rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
#>+ 11
@@ -59464,15 +61591,15 @@
echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
--- kopete/plugins/latex/icons/Makefile.in
+++ kopete/plugins/latex/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59482,7 +61609,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59490,7 +61617,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59503,9 +61630,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59517,7 +61644,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59525,7 +61652,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59541,7 +61668,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -59550,7 +61677,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59564,15 +61691,15 @@
mostlyclean-libtool:
--- kopete/plugins/latex/Makefile.in
+++ kopete/plugins/latex/Makefile.in
-@@ -177,6 +177,7 @@
+@@ -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@
-@@ -273,6 +274,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -275,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59582,7 +61709,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -316,6 +320,7 @@
+@@ -322,6 +326,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59590,7 +61717,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -327,12 +332,9 @@
+@@ -333,12 +338,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59603,9 +61730,9 @@
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@
+@@ -359,10 +361,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59617,7 +61744,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -363,6 +368,7 @@
+@@ -371,6 +376,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59625,7 +61752,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -439,12 +445,15 @@
+@@ -451,12 +457,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59641,7 +61768,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -496,7 +505,7 @@
+@@ -508,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59650,7 +61777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +543,9 @@
+@@ -546,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59664,15 +61791,15 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/Makefile.in
+++ kopete/plugins/Makefile.in
-@@ -119,6 +119,7 @@
+@@ -122,6 +122,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -217,6 +218,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59682,7 +61809,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,6 +262,7 @@
+@@ -264,6 +268,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59690,7 +61817,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -269,12 +274,9 @@
+@@ -275,12 +280,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59703,9 +61830,9 @@
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@
+@@ -301,10 +303,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59717,7 +61844,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -305,6 +310,7 @@
+@@ -313,6 +318,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59725,7 +61852,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -381,12 +387,15 @@
+@@ -393,12 +399,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59741,7 +61868,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -418,7 +427,7 @@
+@@ -430,7 +439,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -59750,7 +61877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +465,9 @@
+@@ -468,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59764,15 +61891,15 @@
mostlyclean-libtool:
--- kopete/plugins/motionautoaway/Makefile.in
+++ kopete/plugins/motionautoaway/Makefile.in
-@@ -160,6 +160,7 @@
+@@ -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@
-@@ -256,6 +257,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -258,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59782,7 +61909,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -299,6 +303,7 @@
+@@ -305,6 +309,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59790,7 +61917,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -310,12 +315,9 @@
+@@ -316,12 +321,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59803,9 +61930,9 @@
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@
+@@ -342,10 +344,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59817,7 +61944,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -346,6 +351,7 @@
+@@ -354,6 +359,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59825,7 +61952,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -422,12 +428,15 @@
+@@ -434,12 +440,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59841,7 +61968,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -473,7 +482,7 @@
+@@ -485,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59850,7 +61977,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +520,9 @@
+@@ -523,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59862,7 +61989,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -843,18 +852,18 @@
+@@ -855,18 +864,18 @@
#>+ 3
@@ -59887,7 +62014,7 @@
#>+ 8
kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
-@@ -867,7 +876,7 @@
+@@ -879,7 +888,7 @@
#>+ 3
clean-metasources:
@@ -59898,15 +62025,15 @@
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
-@@ -164,6 +164,7 @@
+@@ -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@
-@@ -260,6 +261,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -262,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -59916,7 +62043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -303,6 +307,7 @@
+@@ -309,6 +313,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -59924,7 +62051,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -314,12 +319,9 @@
+@@ -320,12 +325,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -59937,9 +62064,9 @@
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@
+@@ -346,10 +348,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -59951,7 +62078,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -350,6 +355,7 @@
+@@ -358,6 +363,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -59959,7 +62086,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -426,12 +432,15 @@
+@@ -438,12 +444,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -59975,7 +62102,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -478,7 +487,7 @@
+@@ -490,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -59984,7 +62111,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +525,9 @@
+@@ -528,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59996,7 +62123,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -891,7 +900,7 @@
+@@ -903,7 +912,7 @@
-rm -f netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
#>+ 2
@@ -60007,7 +62134,7 @@
clean-ui:
--- kopete/plugins/nowlistening/Makefile.in
+++ kopete/plugins/nowlistening/Makefile.in
-@@ -73,8 +73,7 @@
+@@ -74,8 +74,7 @@
kcm_kopete_nowlistening_la_nofinal_OBJECTS = nowlisteningpreferences.lo nowlisteningprefs.lo nowlisteningconfig.lo
@KDE_USE_FINAL_FALSE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_final_OBJECTS)
@@ -60017,15 +62144,15 @@
am_kopete_nowlistening_la_OBJECTS = nowlisteningplugin.lo nlkscd.lo \
nlnoatun.lo nlxmms.lo nowlisteningguiclient.lo nljuk.lo \
nlamarok.lo nlkaffeine.lo
-@@ -170,6 +169,7 @@
+@@ -173,6 +172,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -268,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60035,7 +62162,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,6 +312,7 @@
+@@ -315,6 +318,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60043,7 +62170,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -320,12 +324,9 @@
+@@ -326,12 +330,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60056,9 +62183,9 @@
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@
+@@ -352,10 +353,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60070,7 +62197,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -356,6 +360,7 @@
+@@ -364,6 +368,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60078,7 +62205,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -432,12 +437,15 @@
+@@ -444,12 +449,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60094,7 +62221,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -463,8 +471,8 @@
+@@ -475,8 +483,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
@@ -60105,7 +62232,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 +494,7 @@
+@@ -498,7 +506,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60114,7 +62241,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -524,9 +532,9 @@
+@@ -536,9 +544,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60126,7 +62253,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -890,18 +898,18 @@
+@@ -902,18 +910,18 @@
mocs: nowlisteningpreferences.moc
#>+ 3
@@ -60151,7 +62278,7 @@
#>+ 8
kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
-@@ -914,7 +922,7 @@
+@@ -926,7 +934,7 @@
#>+ 3
clean-metasources:
@@ -60160,7 +62287,7 @@
#>+ 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 +996,7 @@
+@@ -1000,7 +1008,7 @@
rm -f kcm_kopete_nowlistening_la.all_cpp.final kcm_kopete_nowlistening_la.all_cpp.files
#>+ 11
@@ -60169,17 +62296,17 @@
@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
-@@ -151,6 +151,7 @@
+--- kopete/plugins/smpppdcs/icons/Makefile.in
++++ kopete/plugins/smpppdcs/icons/Makefile.in
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60189,7 +62316,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +294,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60197,7 +62324,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -301,12 +306,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60210,9 +62337,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60224,7 +62351,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -337,6 +342,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60232,7 +62359,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -413,12 +419,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60248,16 +62375,16 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -460,7 +469,7 @@
+@@ -406,7 +415,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +507,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60267,19 +62394,19 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kopete/plugins/smpppdcs/icons/Makefile.in
-+++ kopete/plugins/smpppdcs/icons/Makefile.in
-@@ -100,6 +100,7 @@
+
+ mostlyclean-libtool:
+--- kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
++++ kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
+@@ -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@
-@@ -196,6 +197,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -236,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60289,7 +62416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -283,6 +287,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60297,7 +62424,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -294,12 +299,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60310,9 +62437,9 @@
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@
+@@ -320,10 +322,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60324,7 +62451,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -332,6 +337,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60332,7 +62459,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -412,12 +418,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60348,16 +62475,16 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
- all: docs-am all-am
+@@ -451,7 +460,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -489,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60368,18 +62495,18 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
-+++ kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
-@@ -138,6 +138,7 @@
+ clean-noinstLTLIBRARIES:
+--- kopete/plugins/smpppdcs/Makefile.in
++++ kopete/plugins/smpppdcs/Makefile.in
+@@ -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@
-@@ -234,6 +235,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -282,6 +283,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60389,7 +62516,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -277,6 +281,7 @@
+@@ -329,6 +333,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60397,7 +62524,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -288,12 +293,9 @@
+@@ -340,12 +345,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60410,9 +62537,9 @@
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@
+@@ -366,10 +368,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60424,7 +62551,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -324,6 +329,7 @@
+@@ -378,6 +383,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60432,7 +62559,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -400,12 +406,15 @@
+@@ -458,12 +464,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60448,7 +62575,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -439,7 +448,7 @@
+@@ -529,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60457,7 +62584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +486,9 @@
+@@ -567,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60467,19 +62594,62 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -1011,18 +1020,18 @@
- clean-noinstLTLIBRARIES:
---- kopete/plugins/smpppdcs/Makefile.in
-+++ kopete/plugins/smpppdcs/Makefile.in
-@@ -165,6 +165,7 @@
+
+ #>+ 3
+-smpppdcspreferences.moc: $(srcdir)/smpppdcspreferences.h
+- $(MOC) $(srcdir)/smpppdcspreferences.h -o smpppdcspreferences.moc
++smpppdcsprefsimpl.moc: $(srcdir)/smpppdcsprefsimpl.h
++ $(MOC) $(srcdir)/smpppdcsprefsimpl.h -o smpppdcsprefsimpl.moc
+
+ #>+ 2
+-mocs: smpppdcspreferences.moc
++mocs: smpppdcsprefsimpl.moc
+
+ #>+ 3
+-smpppdcsprefsimpl.moc: $(srcdir)/smpppdcsprefsimpl.h
+- $(MOC) $(srcdir)/smpppdcsprefsimpl.h -o smpppdcsprefsimpl.moc
++smpppdcspreferences.moc: $(srcdir)/smpppdcspreferences.h
++ $(MOC) $(srcdir)/smpppdcspreferences.h -o smpppdcspreferences.moc
+
+ #>+ 2
+-mocs: smpppdcsprefsimpl.moc
++mocs: smpppdcspreferences.moc
+
+ #>+ 3
+ detectornetstat.moc: $(srcdir)/detectornetstat.h
+@@ -1080,7 +1089,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f smpppdcspreferences.moc smpppdcsprefsimpl.moc detectornetstat.moc smpppdlocationwidget.moc smpppdcsplugin.moc detectornetworkstatus.moc smpppdsearcher.moc
++ -rm -f smpppdcsprefsimpl.moc smpppdcspreferences.moc detectornetstat.moc smpppdlocationwidget.moc smpppdcsplugin.moc detectornetworkstatus.moc smpppdsearcher.moc
+
+ #>+ 2
+ KDE_DIST=kopete_smpppdcs_config.desktop smpppdcsconfig.kcfgc smpppdlocationui.ui onlineinquiry.h smpppdcspreferences.h smpppdcsprefs.ui kopete_smpppdcs.desktop iconnector.h smpppdcs.kcfg Makefile.in detector.h smpppdcsplugin.h Makefile.am
+@@ -1149,7 +1158,7 @@
+
+
+ #>+ 11
+-kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp $(srcdir)/smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp smpppdsearcher.moc smpppdcspreferences.moc smpppdcsprefsimpl.moc smpppdlocationui.moc smpppdlocationwidget.moc smpppdcsprefs.moc
++kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp $(srcdir)/smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp smpppdsearcher.moc smpppdcsprefsimpl.moc smpppdcspreferences.moc smpppdlocationui.moc smpppdlocationwidget.moc smpppdcsprefs.moc
+ @echo 'creating kcm_kopete_smpppdcs_la.all_cpp.cpp ...'; \
+ rm -f kcm_kopete_smpppdcs_la.all_cpp.files kcm_kopete_smpppdcs_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_kopete_smpppdcs_la.all_cpp.final; \
+--- kopete/plugins/smpppdcs/unittest/Makefile.in
++++ kopete/plugins/smpppdcs/unittest/Makefile.in
+@@ -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@
-@@ -261,6 +262,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -233,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60489,7 +62659,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -304,6 +308,7 @@
+@@ -280,6 +284,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60497,7 +62667,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -315,12 +320,9 @@
+@@ -291,12 +296,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60510,9 +62680,9 @@
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@
+@@ -317,10 +319,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60524,7 +62694,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -351,6 +356,7 @@
+@@ -329,6 +334,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60532,7 +62702,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -427,12 +433,15 @@
+@@ -409,12 +415,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60548,7 +62718,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -479,7 +488,7 @@
+@@ -446,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60557,7 +62727,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +526,9 @@
+@@ -484,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60567,19 +62737,19 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ clean-checkPROGRAMS:
--- kopete/plugins/statistics/Makefile.in
+++ kopete/plugins/statistics/Makefile.in
-@@ -165,6 +165,7 @@
+@@ -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@
-@@ -261,6 +262,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -263,6 +264,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60589,7 +62759,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -304,6 +308,7 @@
+@@ -310,6 +314,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60597,7 +62767,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -315,12 +320,9 @@
+@@ -321,12 +326,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60610,9 +62780,9 @@
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@
+@@ -347,10 +349,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60624,7 +62794,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -351,6 +356,7 @@
+@@ -359,6 +364,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60632,7 +62802,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -427,12 +433,15 @@
+@@ -439,12 +445,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60648,7 +62818,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -475,7 +484,7 @@
+@@ -487,7 +496,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60657,7 +62827,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -513,9 +522,9 @@
+@@ -525,9 +534,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60671,15 +62841,15 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/statistics/sqlite/Makefile.in
+++ kopete/plugins/statistics/sqlite/Makefile.in
-@@ -157,6 +157,7 @@
+@@ -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@
-@@ -253,6 +254,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -255,6 +256,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60689,7 +62859,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +300,7 @@
+@@ -302,6 +306,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60697,7 +62867,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -307,12 +312,9 @@
+@@ -313,12 +318,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60710,9 +62880,9 @@
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@
+@@ -339,10 +341,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60724,7 +62894,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -343,6 +348,7 @@
+@@ -351,6 +356,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60732,7 +62902,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -419,12 +425,15 @@
+@@ -431,12 +437,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60748,7 +62918,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -501,7 +510,7 @@
+@@ -513,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -60757,7 +62927,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +548,9 @@
+@@ -551,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60771,15 +62941,15 @@
clean-noinstLTLIBRARIES:
--- kopete/plugins/texteffect/icons/Makefile.in
+++ kopete/plugins/texteffect/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60789,7 +62959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60797,7 +62967,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60810,9 +62980,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60824,7 +62994,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60832,7 +63002,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60848,7 +63018,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -60857,7 +63027,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60871,15 +63041,15 @@
mostlyclean-libtool:
--- kopete/plugins/texteffect/Makefile.in
+++ kopete/plugins/texteffect/Makefile.in
-@@ -177,6 +177,7 @@
+@@ -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@
-@@ -273,6 +274,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -275,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60889,7 +63059,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -316,6 +320,7 @@
+@@ -322,6 +326,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60897,7 +63067,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -327,12 +332,9 @@
+@@ -333,12 +338,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -60910,9 +63080,9 @@
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@
+@@ -359,10 +361,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -60924,7 +63094,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -363,6 +368,7 @@
+@@ -371,6 +376,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -60932,7 +63102,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -439,12 +445,15 @@
+@@ -451,12 +457,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -60948,7 +63118,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -490,7 +499,7 @@
+@@ -502,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -60957,7 +63127,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +537,9 @@
+@@ -540,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60971,15 +63141,15 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/translator/Makefile.in
+++ kopete/plugins/translator/Makefile.in
-@@ -167,6 +167,7 @@
+@@ -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@
-@@ -263,6 +264,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -265,6 +266,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -60989,7 +63159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -306,6 +310,7 @@
+@@ -312,6 +316,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -60997,7 +63167,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -317,12 +322,9 @@
+@@ -323,12 +328,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61010,9 +63180,9 @@
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@
+@@ -349,10 +351,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61024,7 +63194,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -353,6 +358,7 @@
+@@ -361,6 +366,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61032,7 +63202,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -429,12 +435,15 @@
+@@ -441,12 +447,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61048,7 +63218,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -483,7 +492,7 @@
+@@ -495,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61057,7 +63227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +530,9 @@
+@@ -533,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61069,7 +63239,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -890,7 +899,7 @@
+@@ -902,7 +911,7 @@
-rm -f translatorplugin.moc translatorguiclient.moc translatordialog.moc
#>+ 2
@@ -61080,15 +63250,15 @@
clean-ui:
--- kopete/plugins/webpresence/Makefile.in
+++ kopete/plugins/webpresence/Makefile.in
-@@ -158,6 +158,7 @@
+@@ -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@
-@@ -254,6 +255,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -256,6 +257,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61098,7 +63268,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -297,6 +301,7 @@
+@@ -303,6 +307,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61106,7 +63276,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -308,12 +313,9 @@
+@@ -314,12 +319,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61119,9 +63289,9 @@
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@
+@@ -340,10 +342,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61133,7 +63303,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -344,6 +349,7 @@
+@@ -352,6 +357,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61141,7 +63311,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -420,12 +426,15 @@
+@@ -432,12 +438,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61157,7 +63327,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -477,7 +486,7 @@
+@@ -489,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61166,7 +63336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +524,9 @@
+@@ -527,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61180,15 +63350,15 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/gadu/icons/Makefile.in
+++ kopete/protocols/gadu/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61198,7 +63368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61206,7 +63376,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61219,9 +63389,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61233,7 +63403,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61241,7 +63411,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61257,7 +63427,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61266,7 +63436,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61278,7 +63448,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +586,7 @@
+@@ -589,7 +598,7 @@
.NOEXPORT:
#>+ 2
@@ -61287,7 +63457,7 @@
#>+ 2
docs-am:
-@@ -585,40 +594,40 @@
+@@ -597,40 +606,40 @@
#>+ 37
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -61351,15 +63521,15 @@
force-reedit:
--- kopete/protocols/gadu/libgadu/Makefile.in
+++ kopete/protocols/gadu/libgadu/Makefile.in
-@@ -127,6 +127,7 @@
+@@ -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@
-@@ -223,6 +224,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -225,6 +226,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61369,7 +63539,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -266,6 +270,7 @@
+@@ -272,6 +276,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61377,7 +63547,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -277,12 +282,9 @@
+@@ -283,12 +288,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61390,9 +63560,9 @@
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@
+@@ -309,10 +311,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61404,7 +63574,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -313,6 +318,7 @@
+@@ -321,6 +326,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61412,7 +63582,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -389,12 +395,15 @@
+@@ -401,12 +407,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61428,7 +63598,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -433,7 +442,7 @@
+@@ -446,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -61437,7 +63607,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +480,9 @@
+@@ -484,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61448,18 +63618,27 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
+ libgadu-config.h: stamp-h2
+@@ -498,7 +507,7 @@
+ stamp-h2: $(srcdir)/libgadu-config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h2
+ cd $(top_builddir) && $(SHELL) ./config.status kopete/protocols/gadu/libgadu/libgadu-config.h
+-$(srcdir)/libgadu-config.h.in: $(am__configure_deps)
++$(srcdir)/libgadu-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h2
+ touch $@
--- kopete/protocols/gadu/Makefile.in
+++ kopete/protocols/gadu/Makefile.in
-@@ -175,6 +175,7 @@
+@@ -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@
-@@ -271,6 +272,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -273,6 +274,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61469,7 +63648,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -314,6 +318,7 @@
+@@ -320,6 +324,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61477,7 +63656,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -325,12 +330,9 @@
+@@ -331,12 +336,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61490,9 +63669,9 @@
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@
+@@ -357,10 +359,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61504,7 +63683,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -361,6 +366,7 @@
+@@ -369,6 +374,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61512,7 +63691,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -437,12 +443,15 @@
+@@ -449,12 +455,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61528,7 +63707,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -503,7 +512,7 @@
+@@ -515,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61537,7 +63716,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +550,9 @@
+@@ -553,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61549,7 +63728,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -997,11 +1006,11 @@
+@@ -1009,11 +1018,11 @@
mocs: gaducommands.moc
#>+ 3
@@ -61564,7 +63743,7 @@
#>+ 3
gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
-@@ -1011,11 +1020,11 @@
+@@ -1023,11 +1032,11 @@
mocs: gaduregisteraccount.moc
#>+ 3
@@ -61579,7 +63758,7 @@
#>+ 3
gaduaway.moc: $(srcdir)/gaduaway.h
-@@ -1032,25 +1041,25 @@
+@@ -1044,25 +1053,25 @@
mocs: gaduprotocol.moc
#>+ 3
@@ -61613,7 +63792,7 @@
#>+ 3
clean-closures:
-@@ -1098,7 +1107,7 @@
+@@ -1110,7 +1119,7 @@
#>+ 11
@@ -61622,7 +63801,7 @@
@echo 'creating kopete_gadu_la.all_cpp.cpp ...'; \
rm -f kopete_gadu_la.all_cpp.files kopete_gadu_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_gadu_la.all_cpp.final; \
-@@ -1149,11 +1158,11 @@
+@@ -1161,11 +1170,11 @@
gadupubdir.o: gadupubdir.moc
gadueditaccount.lo: gadueditaccount.moc
gadudccserver.lo: gadudccserver.moc
@@ -61638,15 +63817,15 @@
gaduaddcontactpage.o: gaduaddcontactpage.moc
--- kopete/protocols/gadu/ui/Makefile.in
+++ kopete/protocols/gadu/ui/Makefile.in
-@@ -133,6 +133,7 @@
+@@ -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@
-@@ -229,6 +230,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -231,6 +232,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61656,7 +63835,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,6 +276,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61664,7 +63843,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -283,12 +288,9 @@
+@@ -289,12 +294,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61677,9 +63856,9 @@
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@
+@@ -315,10 +317,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61691,7 +63870,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -319,6 +324,7 @@
+@@ -327,6 +332,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61699,7 +63878,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -395,12 +401,15 @@
+@@ -407,12 +413,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61715,7 +63894,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -441,7 +450,7 @@
+@@ -453,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -61724,7 +63903,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +488,9 @@
+@@ -491,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61738,15 +63917,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/groupwise/icons/Makefile.in
+++ kopete/protocols/groupwise/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61756,7 +63935,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61764,7 +63943,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61777,9 +63956,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61791,7 +63970,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61799,7 +63978,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61815,7 +63994,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -61824,7 +64003,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61836,7 +64015,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +586,7 @@
+@@ -589,7 +598,7 @@
.NOEXPORT:
#>+ 2
@@ -61845,7 +64024,7 @@
#>+ 2
docs-am:
-@@ -585,47 +594,47 @@
+@@ -597,47 +606,47 @@
#>+ 44
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -61921,15 +64100,15 @@
force-reedit:
--- kopete/protocols/groupwise/libgroupwise/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/Makefile.in
-@@ -174,6 +174,7 @@
+@@ -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@
-@@ -270,6 +271,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -274,6 +275,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -61939,7 +64118,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -313,6 +317,7 @@
+@@ -321,6 +325,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -61947,7 +64126,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -324,12 +329,9 @@
+@@ -332,12 +337,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -61960,9 +64139,9 @@
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@
+@@ -358,10 +360,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -61974,7 +64153,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -360,6 +365,7 @@
+@@ -370,6 +375,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -61982,7 +64161,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -436,12 +442,15 @@
+@@ -450,12 +456,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -61998,7 +64177,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -508,7 +517,7 @@
+@@ -522,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -62007,7 +64186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +555,9 @@
+@@ -560,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62019,76 +64198,184 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -945,18 +954,18 @@
+@@ -960,13 +969,6 @@
#>+ 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
+-
+-#>+ 2
-mocs: responseprotocol.moc
-+mocs: userdetailsmanager.moc
+-
+-#>+ 3
+ userdetailsmanager.moc: $(srcdir)/userdetailsmanager.h
+ $(MOC) $(srcdir)/userdetailsmanager.h -o userdetailsmanager.moc
+@@ -981,60 +983,81 @@
+ mocs: chatroommanager.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
+-stream.moc: $(srcdir)/stream.h
+- $(MOC) $(srcdir)/stream.h -o stream.moc
++tlshandler.moc: $(srcdir)/tlshandler.h
++ $(MOC) $(srcdir)/tlshandler.h -o tlshandler.moc
#>+ 2
--mocs: userdetailsmanager.moc
-+mocs: responseprotocol.moc
+-mocs: stream.moc
++mocs: tlshandler.moc
#>+ 3
- stream.moc: $(srcdir)/stream.h
-@@ -966,18 +975,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
++qcatlshandler.moc: $(srcdir)/qcatlshandler.h
++ $(MOC) $(srcdir)/qcatlshandler.h -o qcatlshandler.moc
#>+ 2
-mocs: task.moc
-+mocs: tlshandler.moc
++mocs: qcatlshandler.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
++eventprotocol.moc: $(srcdir)/eventprotocol.h
++ $(MOC) $(srcdir)/eventprotocol.h -o eventprotocol.moc
#>+ 2
-mocs: tlshandler.moc
++mocs: eventprotocol.moc
+
+ #>+ 3
+-qcatlshandler.moc: $(srcdir)/qcatlshandler.h
+- $(MOC) $(srcdir)/qcatlshandler.h -o qcatlshandler.moc
++bytestream.moc: $(srcdir)/bytestream.h
++ $(MOC) $(srcdir)/bytestream.h -o bytestream.moc
+
+ #>+ 2
+-mocs: qcatlshandler.moc
++mocs: bytestream.moc
+
+ #>+ 3
+-client.moc: $(srcdir)/client.h
+- $(MOC) $(srcdir)/client.h -o client.moc
++privacymanager.moc: $(srcdir)/privacymanager.h
++ $(MOC) $(srcdir)/privacymanager.h -o privacymanager.moc
+
+ #>+ 2
+-mocs: client.moc
++mocs: privacymanager.moc
+
+ #>+ 3
+-coreprotocol.moc: $(srcdir)/coreprotocol.h
+- $(MOC) $(srcdir)/coreprotocol.h -o coreprotocol.moc
++connector.moc: $(srcdir)/connector.h
++ $(MOC) $(srcdir)/connector.h -o connector.moc
+
+ #>+ 2
+-mocs: coreprotocol.moc
++mocs: connector.moc
+
+ #>+ 3
+-eventprotocol.moc: $(srcdir)/eventprotocol.h
+- $(MOC) $(srcdir)/eventprotocol.h -o eventprotocol.moc
++responseprotocol.moc: $(srcdir)/responseprotocol.h
++ $(MOC) $(srcdir)/responseprotocol.h -o responseprotocol.moc
+
+ #>+ 2
+-mocs: eventprotocol.moc
++mocs: responseprotocol.moc
+
+ #>+ 3
+-bytestream.moc: $(srcdir)/bytestream.h
+- $(MOC) $(srcdir)/bytestream.h -o bytestream.moc
++stream.moc: $(srcdir)/stream.h
++ $(MOC) $(srcdir)/stream.h -o stream.moc
+
+ #>+ 2
+-mocs: bytestream.moc
++mocs: stream.moc
++
++#>+ 3
++task.moc: $(srcdir)/task.h
++ $(MOC) $(srcdir)/task.h -o task.moc
++
++#>+ 2
+mocs: task.moc
++
++#>+ 3
++client.moc: $(srcdir)/client.h
++ $(MOC) $(srcdir)/client.h -o client.moc
++
++#>+ 2
++mocs: client.moc
++
++#>+ 3
++coreprotocol.moc: $(srcdir)/coreprotocol.h
++ $(MOC) $(srcdir)/coreprotocol.h -o coreprotocol.moc
++
++#>+ 2
++mocs: coreprotocol.moc
#>+ 3
- qcatlshandler.moc: $(srcdir)/qcatlshandler.h
-@@ -1067,7 +1076,7 @@
+ gwclientstream.moc: $(srcdir)/gwclientstream.h
+@@ -1051,13 +1074,6 @@
+ mocs: securestream.moc
#>+ 3
+-privacymanager.moc: $(srcdir)/privacymanager.h
+- $(MOC) $(srcdir)/privacymanager.h -o privacymanager.moc
+-
+-#>+ 2
+-mocs: privacymanager.moc
+-
+-#>+ 3
+ safedelete.moc: $(srcdir)/safedelete.h
+ $(MOC) $(srcdir)/safedelete.h -o safedelete.moc
+
+@@ -1065,13 +1081,6 @@
+ mocs: safedelete.moc
+
+ #>+ 3
+-connector.moc: $(srcdir)/connector.h
+- $(MOC) $(srcdir)/connector.h -o connector.moc
+-
+-#>+ 2
+-mocs: connector.moc
+-
+-#>+ 3
+ inputprotocolbase.moc: $(srcdir)/inputprotocolbase.h
+ $(MOC) $(srcdir)/inputprotocolbase.h -o inputprotocolbase.moc
+
+@@ -1089,7 +1098,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
+- -rm -f responseprotocol.moc userdetailsmanager.moc chatroommanager.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 chatroommanager.moc tlshandler.moc qcatlshandler.moc eventprotocol.moc bytestream.moc privacymanager.moc connector.moc responseprotocol.moc stream.moc task.moc client.moc coreprotocol.moc gwclientstream.moc securestream.moc safedelete.moc inputprotocolbase.moc
#>+ 2
KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am
+@@ -1189,8 +1198,8 @@
+ $(srcdir)/rtf.cc: securestream.moc
+ $(srcdir)/chatroommanager.cpp: securestream.moc
+ $(srcdir)/eventtransfer.cpp: securestream.moc
+-task.lo: task.moc
+ stream.lo: stream.moc
++task.lo: task.moc
+ privacymanager.o: privacymanager.moc
+ task.o: task.moc
+ tlshandler.o: tlshandler.moc
--- kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
-@@ -117,6 +117,7 @@
+@@ -120,6 +120,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -215,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62098,7 +64385,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -256,6 +260,7 @@
+@@ -262,6 +266,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62106,7 +64393,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -267,12 +272,9 @@
+@@ -273,12 +278,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62119,9 +64406,9 @@
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@
+@@ -299,10 +301,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -62133,7 +64420,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -303,6 +308,7 @@
+@@ -311,6 +316,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -62141,7 +64428,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -379,12 +385,15 @@
+@@ -391,12 +397,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -62157,7 +64444,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -62166,7 +64453,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62180,15 +64467,15 @@
mostlyclean-libtool:
--- kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
-@@ -130,6 +130,7 @@
+@@ -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@
-@@ -226,6 +227,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -228,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62198,7 +64485,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,6 +273,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62206,7 +64493,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -280,12 +285,9 @@
+@@ -286,12 +291,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62219,9 +64506,9 @@
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@
+@@ -312,10 +314,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -62233,7 +64520,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -316,6 +321,7 @@
+@@ -324,6 +329,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -62241,7 +64528,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -392,12 +398,15 @@
+@@ -404,12 +410,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -62257,7 +64544,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -430,7 +439,7 @@
+@@ -442,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62266,7 +64553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +477,9 @@
+@@ -480,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62280,15 +64567,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
-@@ -157,6 +157,7 @@
+@@ -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@
-@@ -253,6 +254,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -269,6 +270,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62298,7 +64585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -296,6 +300,7 @@
+@@ -316,6 +320,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62306,7 +64593,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -307,12 +312,9 @@
+@@ -327,12 +332,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62319,9 +64606,9 @@
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@
+@@ -353,10 +355,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -62333,7 +64620,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -343,6 +348,7 @@
+@@ -365,6 +370,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -62341,7 +64628,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -419,12 +425,15 @@
+@@ -445,12 +451,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -62357,7 +64644,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -477,7 +486,7 @@
+@@ -505,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62366,7 +64653,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +524,9 @@
+@@ -543,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62378,112 +64665,89 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -850,13 +859,6 @@
+@@ -855,18 +864,18 @@
mocs: connectiontask.moc
#>+ 3
-updateitemtask.moc: $(srcdir)/updateitemtask.h
- $(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
--
--#>+ 2
++createcontactinstancetask.moc: $(srcdir)/createcontactinstancetask.h
++ $(MOC) $(srcdir)/createcontactinstancetask.h -o createcontactinstancetask.moc
+
+ #>+ 2
-mocs: updateitemtask.moc
--
--#>+ 3
- logintask.moc: $(srcdir)/logintask.h
- $(MOC) $(srcdir)/logintask.h -o logintask.moc
++mocs: createcontactinstancetask.moc
-@@ -871,6 +873,13 @@
- mocs: createcontactinstancetask.moc
-
#>+ 3
+-createcontactinstancetask.moc: $(srcdir)/createcontactinstancetask.h
+- $(MOC) $(srcdir)/createcontactinstancetask.h -o createcontactinstancetask.moc
+updateitemtask.moc: $(srcdir)/updateitemtask.h
+ $(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
-+
-+#>+ 2
+
+ #>+ 2
+-mocs: createcontactinstancetask.moc
+mocs: updateitemtask.moc
-+
-+#>+ 3
+
+ #>+ 3
rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
- $(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
+@@ -953,18 +962,18 @@
+ mocs: movecontacttask.moc
-@@ -892,18 +901,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
+-getchatsearchresultstask.moc: $(srcdir)/getchatsearchresultstask.h
+- $(MOC) $(srcdir)/getchatsearchresultstask.h -o getchatsearchresultstask.moc
++statustask.moc: $(srcdir)/statustask.h
++ $(MOC) $(srcdir)/statustask.h -o statustask.moc
#>+ 2
--mocs: searchtask.moc
-+mocs: privacyitemtask.moc
+-mocs: getchatsearchresultstask.moc
++mocs: statustask.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
+-statustask.moc: $(srcdir)/statustask.h
+- $(MOC) $(srcdir)/statustask.h -o statustask.moc
++getchatsearchresultstask.moc: $(srcdir)/getchatsearchresultstask.h
++ $(MOC) $(srcdir)/getchatsearchresultstask.h -o getchatsearchresultstask.moc
#>+ 2
--mocs: privacyitemtask.moc
-+mocs: searchtask.moc
+-mocs: statustask.moc
++mocs: getchatsearchresultstask.moc
#>+ 3
- joinconferencetask.moc: $(srcdir)/joinconferencetask.h
-@@ -984,10 +993,10 @@
+ createfoldertask.moc: $(srcdir)/createfoldertask.h
+@@ -1052,10 +1061,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
+- -rm -f deleteitemtask.moc requesttask.moc modifycontactlisttask.moc getstatustask.moc connectiontask.moc updateitemtask.moc createcontactinstancetask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc searchusertask.moc privacyitemtask.moc joinconferencetask.moc chatpropertiestask.moc conferencetask.moc typingtask.moc joinchattask.moc needfoldertask.moc movecontacttask.moc getchatsearchresultstask.moc statustask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc pollsearchresultstask.moc logintask.moc chatcountstask.moc createcontacttask.moc searchchattask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc keepalivetask.moc
++ -rm -f deleteitemtask.moc requesttask.moc modifycontactlisttask.moc getstatustask.moc connectiontask.moc createcontactinstancetask.moc updateitemtask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc searchusertask.moc privacyitemtask.moc joinconferencetask.moc chatpropertiestask.moc conferencetask.moc typingtask.moc joinchattask.moc needfoldertask.moc movecontacttask.moc statustask.moc getchatsearchresultstask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc pollsearchresultstask.moc logintask.moc chatcountstask.moc createcontacttask.moc searchchattask.moc updatefoldertask.moc updatecontacttask.moc eventtask.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
+-KDE_DIST=gwtasklogin.cpp chatpropertiestask.h keepalivetask.h createcontactinstancetask.h Makefile.in Makefile.am gwtasklogin.h
++KDE_DIST=gwtasklogin.cpp chatpropertiestask.h keepalivetask.h createcontactinstancetask.h Makefile.in gwtasklogin.h Makefile.am
#>+ 3
clean-closures:
-@@ -1035,7 +1044,7 @@
+@@ -1103,7 +1112,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
+-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)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp $(srcdir)/searchchattask.cpp $(srcdir)/searchusertask.cpp $(srcdir)/getchatsearchresultstask.cpp $(srcdir)/chatcountstask.cpp $(srcdir)/chatpropertiestask.cpp $(srcdir)/joinchattask.cpp deleteitemtask.moc requesttask.moc modifycontactlisttask.moc getstatustask.moc connectiontask.moc updateitemtask.moc createcontactinstancetask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc searchusertask.moc privacyitemtask.moc joinconferencetask.moc chatpropertiestask.moc conferencetask.moc typingtask.moc joinchattask.moc needfoldertask.moc movecontacttask.moc statustask.moc getchatsearchresultstask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc pollsearchresultstask.moc logintask.moc chatcountstask.moc createcontacttask.moc searchchattask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc keepalivetask.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)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp $(srcdir)/searchchattask.cpp $(srcdir)/searchusertask.cpp $(srcdir)/getchatsearchresultstask.cpp $(srcdir)/chatcountstask.cpp $(srcdir)/chatpropertiestask.cpp $(srcdir)/joinchattask.cpp deleteitemtask.moc requesttask.moc modifycontactlisttask.moc getstatustask.moc connectiontask.moc createcontactinstancetask.moc updateitemtask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc searchusertask.moc privacyitemtask.moc joinconferencetask.moc chatpropertiestask.moc conferencetask.moc typingtask.moc joinchattask.moc needfoldertask.moc movecontacttask.moc getchatsearchresultstask.moc statustask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc pollsearchresultstask.moc logintask.moc chatcountstask.moc createcontacttask.moc searchchattask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc keepalivetask.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 +1117,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 +1131,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
-@@ -131,6 +131,7 @@
+@@ -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@
-@@ -227,6 +228,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -229,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62493,7 +64757,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -270,6 +274,7 @@
+@@ -276,6 +280,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62501,7 +64765,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -281,12 +286,9 @@
+@@ -287,12 +292,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62514,9 +64778,9 @@
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@
+@@ -313,10 +315,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -62528,7 +64792,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -317,6 +322,7 @@
+@@ -325,6 +330,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -62536,7 +64800,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -393,12 +399,15 @@
+@@ -405,12 +411,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -62552,7 +64816,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -428,7 +437,7 @@
+@@ -440,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62561,7 +64825,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +475,9 @@
+@@ -478,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62575,15 +64839,15 @@
clean-noinstPROGRAMS:
--- kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
-@@ -151,6 +151,7 @@
+@@ -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@
-@@ -247,6 +248,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -249,6 +250,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62593,7 +64857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +294,7 @@
+@@ -296,6 +300,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62601,7 +64865,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -301,12 +306,9 @@
+@@ -307,12 +312,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62614,9 +64878,9 @@
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@
+@@ -333,10 +335,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -62628,7 +64892,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -337,6 +342,7 @@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -62636,7 +64900,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -413,12 +419,15 @@
+@@ -425,12 +431,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -62652,7 +64916,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -468,7 +477,7 @@
+@@ -480,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62661,7 +64925,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +515,9 @@
+@@ -518,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62675,15 +64939,15 @@
clean-noinstPROGRAMS:
--- kopete/protocols/groupwise/Makefile.in
+++ kopete/protocols/groupwise/Makefile.in
-@@ -170,6 +170,7 @@
+@@ -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@
-@@ -266,6 +267,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -268,6 +269,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62693,7 +64957,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,6 +313,7 @@
+@@ -315,6 +319,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62701,7 +64965,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -320,12 +325,9 @@
+@@ -326,12 +331,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62714,9 +64978,9 @@
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@
+@@ -352,10 +354,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -62728,7 +64992,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -356,6 +361,7 @@
+@@ -364,6 +369,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -62736,7 +65000,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -432,12 +438,15 @@
+@@ -444,12 +450,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -62752,7 +65016,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -490,7 +499,7 @@
+@@ -502,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62761,7 +65025,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +537,9 @@
+@@ -540,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62773,7 +65037,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -946,18 +955,18 @@
+@@ -958,18 +967,18 @@
#>+ 3
@@ -62798,7 +65062,7 @@
#>+ 3
gwbytestream.moc: $(srcdir)/gwbytestream.h
-@@ -974,18 +983,18 @@
+@@ -986,18 +995,18 @@
mocs: gwconnector.moc
#>+ 3
@@ -62823,7 +65087,7 @@
#>+ 3
gwcontactlist.moc: $(srcdir)/gwcontactlist.h
-@@ -996,7 +1005,7 @@
+@@ -1008,7 +1017,7 @@
#>+ 3
clean-metasources:
@@ -62832,7 +65096,7 @@
#>+ 2
KDE_DIST=DESIGN gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am
-@@ -1047,7 +1056,7 @@
+@@ -1059,7 +1068,7 @@
#>+ 11
@@ -62841,7 +65105,7 @@
@echo 'creating kopete_groupwise_la.all_cpp.cpp ...'; \
rm -f kopete_groupwise_la.all_cpp.files kopete_groupwise_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_groupwise_la.all_cpp.final; \
-@@ -1088,8 +1097,8 @@
+@@ -1100,8 +1109,8 @@
gwbytestream.o: gwbytestream.moc
gwconnector.o: gwconnector.moc
gwaccount.lo: gwaccount.moc
@@ -62853,15 +65117,15 @@
gwcontact.o: gwcontact.moc
--- kopete/protocols/groupwise/ui/Makefile.in
+++ kopete/protocols/groupwise/ui/Makefile.in
-@@ -141,6 +141,7 @@
+@@ -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@
-@@ -237,6 +238,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -241,6 +242,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62871,7 +65135,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -280,6 +284,7 @@
+@@ -288,6 +292,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62879,7 +65143,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -291,12 +296,9 @@
+@@ -299,12 +304,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62892,9 +65156,9 @@
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@
+@@ -325,10 +327,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -62906,7 +65170,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -327,6 +332,7 @@
+@@ -337,6 +342,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -62914,7 +65178,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -403,12 +409,15 @@
+@@ -417,12 +423,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -62930,7 +65194,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -460,7 +469,7 @@
+@@ -476,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -62939,7 +65203,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +507,9 @@
+@@ -514,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62951,17 +65215,60 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -759,18 +768,18 @@
+ mocs: gwreceiveinvitationdialog.moc
+
+ #>+ 3
+-gwchatpropsdialog.moc: $(srcdir)/gwchatpropsdialog.h
+- $(MOC) $(srcdir)/gwchatpropsdialog.h -o gwchatpropsdialog.moc
++gwsearch.moc: $(srcdir)/gwsearch.h
++ $(MOC) $(srcdir)/gwsearch.h -o gwsearch.moc
+
+ #>+ 2
+-mocs: gwchatpropsdialog.moc
++mocs: gwsearch.moc
+
+ #>+ 3
+-gwsearch.moc: $(srcdir)/gwsearch.h
+- $(MOC) $(srcdir)/gwsearch.h -o gwsearch.moc
++gwchatpropsdialog.moc: $(srcdir)/gwchatpropsdialog.h
++ $(MOC) $(srcdir)/gwchatpropsdialog.h -o gwchatpropsdialog.moc
+
+ #>+ 2
+-mocs: gwsearch.moc
++mocs: gwchatpropsdialog.moc
+
+ #>+ 3
+ gwprivacydialog.moc: $(srcdir)/gwprivacydialog.h
+@@ -809,7 +818,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f gwreceiveinvitationdialog.moc gwchatpropsdialog.moc gwsearch.moc gwprivacydialog.moc gwcontactproperties.moc gweditaccountwidget.moc gwaddcontactpage.moc gwchatsearchdialog.moc
++ -rm -f gwreceiveinvitationdialog.moc gwsearch.moc gwchatpropsdialog.moc gwprivacydialog.moc gwcontactproperties.moc gweditaccountwidget.moc gwaddcontactpage.moc gwchatsearchdialog.moc
+
+ #>+ 2
+ KDE_DIST=gwshowinvitation.ui gwaddcontactpage.h gwprivacy.ui gwcustomstatuswidget.ui gwchatpropswidget.ui gwcustomstatusedit.ui gwchatsearchwidget.ui gwaccountpreferences.ui gweditaccountwidget.h gwaddui.ui Makefile.in gwcontactpropswidget.ui gwcontactsearch.ui Makefile.am
+@@ -870,7 +879,7 @@
+
+
+ #>+ 11
+-libkopetegroupwiseui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwaddcontactpage.cpp $(srcdir)/gweditaccountwidget.cpp $(srcdir)/gwreceiveinvitationdialog.cpp $(srcdir)/gwcontactproperties.cpp $(srcdir)/gwprivacydialog.cpp $(srcdir)/gwsearch.cpp $(srcdir)/gwchatsearchdialog.cpp $(srcdir)/gwchatpropsdialog.cpp gwaccountpreferences.cpp gwaddui.cpp gwshowinvitation.cpp gwcontactpropswidget.cpp gwprivacy.cpp gwcustomstatuswidget.cpp gwcustomstatusedit.cpp gwcontactsearch.cpp gwchatsearchwidget.cpp gwchatpropswidget.cpp gwaccountpreferences.moc gwprivacydialog.moc gwchatsearchwidget.moc gwprivacy.moc gwcustomstatusedit.moc gwcontactsearch.moc gwshowinvitation.moc gwcontactpropswidget.moc gwaddcontactpage.moc gwchatsearchdialog.moc gwaddui.moc gwreceiveinvitationdialog.moc gwchatpropsdialog.moc gwsearch.moc gwcustomstatuswidget.moc gwchatpropswidget.moc gwcontactproperties.moc gweditaccountwidget.moc
++libkopetegroupwiseui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwaddcontactpage.cpp $(srcdir)/gweditaccountwidget.cpp $(srcdir)/gwreceiveinvitationdialog.cpp $(srcdir)/gwcontactproperties.cpp $(srcdir)/gwprivacydialog.cpp $(srcdir)/gwsearch.cpp $(srcdir)/gwchatsearchdialog.cpp $(srcdir)/gwchatpropsdialog.cpp gwaccountpreferences.cpp gwaddui.cpp gwshowinvitation.cpp gwcontactpropswidget.cpp gwprivacy.cpp gwcustomstatuswidget.cpp gwcustomstatusedit.cpp gwcontactsearch.cpp gwchatsearchwidget.cpp gwchatpropswidget.cpp gwaccountpreferences.moc gwprivacydialog.moc gwchatsearchwidget.moc gwprivacy.moc gwcustomstatusedit.moc gwcontactsearch.moc gwshowinvitation.moc gwcontactpropswidget.moc gwaddcontactpage.moc gwchatsearchdialog.moc gwaddui.moc gwreceiveinvitationdialog.moc gwsearch.moc gwchatpropsdialog.moc gwcustomstatuswidget.moc gwchatpropswidget.moc gwcontactproperties.moc gweditaccountwidget.moc
+ @echo 'creating libkopetegroupwiseui_la.all_cpp.cpp ...'; \
+ rm -f libkopetegroupwiseui_la.all_cpp.files libkopetegroupwiseui_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkopetegroupwiseui_la.all_cpp.final; \
--- kopete/protocols/irc/icons/Makefile.in
+++ kopete/protocols/irc/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -62971,7 +65278,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -62979,7 +65286,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -62992,9 +65299,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -63006,7 +65313,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -63014,7 +65321,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -63030,7 +65337,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -63039,7 +65346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63051,7 +65358,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,31 +593,31 @@
+@@ -596,31 +605,31 @@
#>+ 27
install-kde-icons:
@@ -63098,15 +65405,15 @@
force-reedit:
--- kopete/protocols/irc/libkirc/Makefile.in
+++ kopete/protocols/irc/libkirc/Makefile.in
-@@ -137,6 +137,7 @@
+@@ -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@
-@@ -233,6 +234,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -235,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63116,7 +65423,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -276,6 +280,7 @@
+@@ -282,6 +286,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63124,7 +65431,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -287,12 +292,9 @@
+@@ -293,12 +298,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -63137,9 +65444,9 @@
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@
+@@ -319,10 +321,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -63151,7 +65458,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -323,6 +328,7 @@
+@@ -331,6 +336,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -63159,7 +65466,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -399,12 +405,15 @@
+@@ -411,12 +417,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -63175,7 +65482,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -451,7 +460,7 @@
+@@ -463,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -63184,7 +65491,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +498,9 @@
+@@ -501,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63196,7 +65503,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -770,36 +779,36 @@
+@@ -782,18 +791,18 @@
mocs: kirctransferserver.moc
#>+ 3
@@ -63210,53 +65517,37 @@
+mocs: kirctransferhandler.moc
#>+ 3
--kircmessage.moc: $(srcdir)/kircmessage.h
-- $(MOC) $(srcdir)/kircmessage.h -o kircmessage.moc
+-kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
+- $(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
+kircengine.moc: $(srcdir)/kircengine.h
+ $(MOC) $(srcdir)/kircengine.h -o kircengine.moc
#>+ 2
--mocs: kircmessage.moc
+-mocs: kirctransferhandler.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
+ ksslsocket.moc: $(srcdir)/ksslsocket.h
+@@ -804,7 +813,7 @@
- #>+ 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
+- -rm -f kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kircengine.moc kirctransferhandler.moc ksslsocket.moc
++ -rm -f kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kirctransferhandler.moc kircengine.moc ksslsocket.moc
#>+ 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
-@@ -173,6 +173,7 @@
+@@ -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@
-@@ -269,6 +270,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -271,6 +272,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63266,7 +65557,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -312,6 +316,7 @@
+@@ -318,6 +322,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63274,7 +65565,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -323,12 +328,9 @@
+@@ -329,12 +334,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -63287,9 +65578,9 @@
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@
+@@ -355,10 +357,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -63301,7 +65592,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -359,6 +364,7 @@
+@@ -367,6 +372,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -63309,7 +65600,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -435,12 +441,15 @@
+@@ -447,12 +453,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -63325,7 +65616,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -502,7 +511,7 @@
+@@ -514,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -63334,7 +65625,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +549,9 @@
+@@ -552,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63346,7 +65637,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -990,18 +999,18 @@
+@@ -1002,18 +1011,18 @@
mocs: ircchannelcontact.moc
#>+ 3
@@ -63371,7 +65662,7 @@
#>+ 3
ircguiclient.moc: $(srcdir)/ircguiclient.h
-@@ -1018,18 +1027,18 @@
+@@ -1030,18 +1039,18 @@
mocs: irccontact.moc
#>+ 3
@@ -63396,7 +65687,7 @@
#>+ 3
ircusercontact.moc: $(srcdir)/ircusercontact.h
-@@ -1068,7 +1077,7 @@
+@@ -1080,7 +1089,7 @@
#>+ 3
clean-metasources:
@@ -63405,7 +65696,7 @@
#>+ 2
KDE_DIST=irc.protocol irctransferhandler.h ircguiclient.h ircsignalhandler.h kopete_irc.desktop ircusercontact.h ircchatui.rc ksparser.h ircchannelcontact.h ircprotocol.h ircnetworks.xml irccontactmanager.h ircaddcontactpage.h Makefile.in kcodecaction.h ircservercontact.h irccontact.h Makefile.am ircaccount.h
-@@ -1119,7 +1128,7 @@
+@@ -1131,7 +1140,7 @@
#>+ 11
@@ -63416,15 +65707,15 @@
echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
--- kopete/protocols/irc/ui/Makefile.in
+++ kopete/protocols/irc/ui/Makefile.in
-@@ -135,6 +135,7 @@
+@@ -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@
-@@ -231,6 +232,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -233,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63434,7 +65725,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -274,6 +278,7 @@
+@@ -280,6 +284,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63442,7 +65733,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -285,12 +290,9 @@
+@@ -291,12 +296,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -63455,9 +65746,9 @@
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@
+@@ -317,10 +319,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -63469,7 +65760,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -321,6 +326,7 @@
+@@ -329,6 +334,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -63477,7 +65768,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -397,12 +403,15 @@
+@@ -409,12 +415,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -63493,7 +65784,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -442,7 +451,7 @@
+@@ -454,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -63502,7 +65793,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +489,9 @@
+@@ -492,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63516,15 +65807,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/icons/Makefile.in
+++ kopete/protocols/jabber/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63534,7 +65825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63542,7 +65833,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -63555,9 +65846,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -63569,7 +65860,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -63577,7 +65868,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -63593,7 +65884,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -405,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -63602,7 +65893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -443,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63614,160 +65905,398 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,87 +586,87 @@
+@@ -588,110 +597,110 @@
.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
+-KDE_DIST=hi16-action-jabber_original.png hi16-action-jabber_away.png cr16-action-jabber_invisible.png cr48-app-jabber_protocol.png cr16-app-jabber_gateway_icq.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-app-jabber_gateway_sms.png cr16-action-jabber_offline.png cr16-app-jabber_gateway_http-ws.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-app-jabber_gateway_tlen.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-app-jabber_gateway_yahoo.png cr16-app-jabber_gateway_irc.png cr16-action-jabber_online.png cr16-app-jabber_gateway_msn.png cr16-app-jabber_gateway_aim.png cr16-app-jabber_gateway_smtp.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-app-jabber_gateway_gadu.png cr16-action-jabber_chatty.png cr16-app-jabber_gateway_qq.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-app-jabber_gateway_icq.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-app-jabber_gateway_sms.png cr16-action-jabber_offline.png cr16-app-jabber_gateway_http-ws.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-app-jabber_gateway_tlen.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-app-jabber_gateway_yahoo.png cr16-app-jabber_gateway_irc.png cr16-action-jabber_online.png cr16-app-jabber_gateway_msn.png cr16-app-jabber_gateway_aim.png cr16-app-jabber_gateway_smtp.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-app-jabber_gateway_gadu.png cr16-action-jabber_chatty.png cr16-app-jabber_gateway_qq.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
+ #>+ 99
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
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_invisible.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_serv_off.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_xa.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_serv_on.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/jabber_protocol.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_chatty.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_invisible.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_invisible.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_offline.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_group.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_raw.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_chatty.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_away.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_http-ws.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http/ws.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_chatty.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_raw.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_sms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_sms.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_na.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_na.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_na.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/jabber_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_original.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_raw.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_away.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_online.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_xa.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_xa.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_xa.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_offline.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_off.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_serv_off.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_serv_on.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_offline.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_invisible.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_online.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_raw.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_chatty.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_na.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_group.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_yahoo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_yahoo.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/jabber_protocol.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_original.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_original.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_away.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_online.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_gadu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_gadu.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_msn.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_msn.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_offline.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_group.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_serv_on.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/jabber_protocol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_smtp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_smtp.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_serv_on.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_aim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_aim.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_yahoo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_yahoo.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_connecting.mng
+ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_icq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_icq.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_http-ws.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http/ws.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_gadu.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_gadu.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_smtp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_smtp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_away.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/jabber_protocol.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_qq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_qq.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_msn.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_msn.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_tlen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_tlen.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_sms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_sms.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_irc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_irc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_group.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_original.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-jabber_gateway_tlen.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_tlen.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kde_icondir)/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
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_serv_off.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_xa.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_protocol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_serv_on.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/jabber_protocol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_connecting.mng
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_invisible.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_chatty.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_invisible.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_offline.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_group.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_raw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_chatty.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http/ws.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_chatty.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_raw.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_sms.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_na.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_na.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/jabber_protocol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_original.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_raw.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_xa.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_xa.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_offline.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_serv_off.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_serv_on.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_offline.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_invisible.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_online.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_raw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_chatty.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_na.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_group.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_yahoo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/jabber_protocol.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_original.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_online.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_gadu.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_msn.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_offline.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_group.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_serv_on.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/jabber_protocol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_smtp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_serv_on.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_aim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_yahoo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_connecting.mng
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_icq.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_http/ws.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_gadu.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_smtp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_away.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/jabber_protocol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/jabber_protocol.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_qq.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_msn.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_tlen.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_sms.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_irc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_group.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/jabber_original.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/jabber_gateway_tlen.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/jabber_serv_off.png
#>+ 15
force-reedit:
---- kopete/protocols/jabber/kioslave/Makefile.in
-+++ kopete/protocols/jabber/kioslave/Makefile.in
+--- kopete/protocols/jabber/jingle/libjingle/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/Makefile.in
+@@ -120,6 +120,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -215,6 +216,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -262,6 +266,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -273,12 +278,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,10 +301,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -311,6 +316,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ 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@
+@@ -422,7 +431,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -460,9 +469,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile.in
@@ -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@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -249,6 +250,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -333,10 +335,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -514,7 +523,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .c .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -552,9 +561,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.in
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
@@ -250,6 +251,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -63778,7 +66307,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -293,6 +297,7 @@
+@@ -297,6 +301,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63786,7 +66315,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -304,12 +309,9 @@
+@@ -308,12 +313,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -63799,9 +66328,9 @@
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@
+@@ -334,10 +336,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -63813,7 +66342,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -340,6 +345,7 @@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -63821,7 +66350,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -416,12 +422,15 @@
+@@ -426,12 +432,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -63837,16 +66366,1325 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -467,7 +476,7 @@
+@@ -473,7 +482,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -511,9 +520,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+--- kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile.in
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -257,6 +258,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -341,10 +343,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -480,7 +489,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -518,9 +527,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/examples/Makefile.in
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -261,6 +265,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -272,12 +277,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -310,6 +315,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ 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@
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -459,9 +468,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kopete/protocols/jabber/jingle/libjingle/talk/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/Makefile.in
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -261,6 +265,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -272,12 +277,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -310,6 +315,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ 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@
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -459,9 +468,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.in
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -266,6 +267,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -350,10 +352,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -513,7 +522,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -551,9 +560,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile.in
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -236,6 +237,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -320,10 +322,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -453,7 +462,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -491,9 +500,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/p2p/Makefile.in
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -261,6 +265,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -272,12 +277,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -310,6 +315,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ 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@
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -459,9 +468,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/session/Makefile.in
+@@ -122,6 +122,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -217,6 +218,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -264,6 +268,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -275,12 +280,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_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 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -425,7 +434,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -463,9 +472,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.in
+@@ -144,6 +144,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -239,6 +240,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -323,10 +325,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -415,12 +421,15 @@
+ libexecdir = @libexecdir@
+ librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
+ librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -464,7 +473,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -502,9 +511,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/third_party/Makefile.in
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -261,6 +265,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XMMS_INCLUDES = @XMMS_INCLUDES@
+ XMMS_LDFLAGS = @XMMS_LDFLAGS@
+@@ -272,12 +277,9 @@
+ X_RPATH = @X_RPATH@
+ YAHOO2_VERSION = @YAHOO2_VERSION@
+ YAHOOPKGREQ = @YAHOOPKGREQ@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
+ filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
+@@ -310,6 +315,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ 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@
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -459,9 +468,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/Makefile.in
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -242,6 +243,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -326,10 +328,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -538,7 +547,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -576,9 +585,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile.in
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -238,6 +239,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -322,10 +324,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -501,9 +510,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile.in
++++ kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile.in
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -238,6 +239,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -322,10 +324,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -475,7 +484,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -513,9 +522,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/protocols/jabber/jingle/Makefile.in
++++ kopete/protocols/jabber/jingle/Makefile.in
+@@ -70,7 +70,7 @@
+ libkopetejabberjingle_la_final_OBJECTS = libkopetejabberjingle_la.all_cpp.lo
+ libkopetejabberjingle_la_nofinal_OBJECTS = jinglevoicecaller.lo \
+ jinglevoicesessiondialog.lo jinglevoicesessiondialogbase.lo\
+-voicecaller.moc.lo jinglevoicecaller.moc.lo
++jinglevoicecaller.moc.lo voicecaller.moc.lo
+ @KDE_USE_FINAL_FALSE at libkopetejabberjingle_la_OBJECTS = $(libkopetejabberjingle_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at libkopetejabberjingle_la_OBJECTS = $(libkopetejabberjingle_la_final_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/kopete/protocols/gadu/libgadu
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -260,6 +261,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -344,10 +346,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -496,7 +505,7 @@
+
+ .SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +514,9 @@
+@@ -534,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63856,19 +67694,170 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+@@ -877,13 +886,6 @@
+ mocs: jinglevoicesessiondialog.moc
+
+ #>+ 3
+-voicecaller.moc.cpp: $(srcdir)/voicecaller.h
+- $(MOC) $(srcdir)/voicecaller.h -o voicecaller.moc.cpp
+-
+-#>+ 2
+-mocs: voicecaller.moc.cpp
+-
+-#>+ 3
+ jinglevoicecaller.moc.cpp: $(srcdir)/jinglevoicecaller.h
+ $(MOC) $(srcdir)/jinglevoicecaller.h -o jinglevoicecaller.moc.cpp
+
+@@ -898,6 +900,13 @@
+ mocs: jinglesession.moc
+
+ #>+ 3
++voicecaller.moc.cpp: $(srcdir)/voicecaller.h
++ $(MOC) $(srcdir)/voicecaller.h -o voicecaller.moc.cpp
++
++#>+ 2
++mocs: voicecaller.moc.cpp
++
++#>+ 3
+ jinglesessionmanager.moc: $(srcdir)/jinglesessionmanager.h
+ $(MOC) $(srcdir)/jinglesessionmanager.h -o jinglesessionmanager.moc
+
+@@ -920,7 +929,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f jinglevoicesessiondialog.moc voicecaller.moc.cpp jinglevoicecaller.moc.cpp jinglesession.moc jinglesessionmanager.moc jinglewatchsessiontask.moc jinglevoicesession.moc
++ -rm -f jinglevoicesessiondialog.moc jinglevoicecaller.moc.cpp jinglesession.moc voicecaller.moc.cpp jinglesessionmanager.moc jinglewatchsessiontask.moc jinglevoicesession.moc
+
+ #>+ 2
+ KDE_DIST=configure.in.bot jinglesession.h jinglevoicesession.cpp jinglesessionmanager.cpp jinglevoicesessiondialog.h jinglevoicesession.h jinglevoicecaller.h DESIGN jinglesessionmanager.h jinglesession.cpp voicecaller.h configure.in.in jinglewatchsessiontask.cpp Makefile.in jinglevoicesessiondialogbase.ui jinglewatchsessiontask.h Makefile.am
+@@ -972,11 +981,11 @@
+
+
+ #>+ 11
+-libkopetejabberjingle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jinglevoicecaller.cpp $(srcdir)/jinglevoicesessiondialog.cpp jinglevoicesessiondialogbase.cpp voicecaller.moc.cpp jinglevoicecaller.moc.cpp jinglevoicesessiondialog.moc jinglevoicesessiondialogbase.moc
++libkopetejabberjingle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jinglevoicecaller.cpp $(srcdir)/jinglevoicesessiondialog.cpp jinglevoicesessiondialogbase.cpp jinglevoicecaller.moc.cpp voicecaller.moc.cpp jinglevoicesessiondialog.moc jinglevoicesessiondialogbase.moc
+ @echo 'creating libkopetejabberjingle_la.all_cpp.cpp ...'; \
+ rm -f libkopetejabberjingle_la.all_cpp.files libkopetejabberjingle_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkopetejabberjingle_la.all_cpp.final; \
+- for file in jinglevoicecaller.cpp jinglevoicesessiondialog.cpp jinglevoicesessiondialogbase.cpp voicecaller.moc.cpp jinglevoicecaller.moc.cpp ; do \
++ for file in jinglevoicecaller.cpp jinglevoicesessiondialog.cpp jinglevoicesessiondialogbase.cpp jinglevoicecaller.moc.cpp voicecaller.moc.cpp ; do \
+ echo "#include \"$$file\"" >> libkopetejabberjingle_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkopetejabberjingle_la.all_cpp.final; \
+ done; \
+--- kopete/protocols/jabber/kioslave/Makefile.in
++++ kopete/protocols/jabber/kioslave/Makefile.in
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -252,6 +253,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -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@
+@@ -336,10 +338,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
+ dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++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@
+@@ -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@
+@@ -479,7 +488,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -517,9 +526,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- kopete/protocols/jabber/libiris/cutestuff/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63878,7 +67867,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63886,7 +67875,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -63899,9 +67888,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -63913,7 +67902,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -63921,7 +67910,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -63937,7 +67926,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -63946,7 +67935,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63960,15 +67949,15 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
-@@ -133,6 +133,7 @@
+@@ -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@
-@@ -229,6 +230,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -231,6 +232,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -63978,7 +67967,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,6 +276,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -63986,7 +67975,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -283,12 +288,9 @@
+@@ -289,12 +294,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -63999,9 +67988,9 @@
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@
+@@ -315,10 +317,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64013,7 +68002,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -319,6 +324,7 @@
+@@ -327,6 +332,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64021,7 +68010,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -395,12 +401,15 @@
+@@ -407,12 +413,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64037,7 +68026,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -439,7 +448,7 @@
+@@ -451,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -64046,7 +68035,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +486,9 @@
+@@ -489,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64058,7 +68047,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -728,18 +737,18 @@
+@@ -740,18 +749,18 @@
mocs: ndns.moc
#>+ 3
@@ -64083,7 +68072,7 @@
#>+ 3
httppoll.moc: $(srcdir)/httppoll.h
-@@ -764,10 +773,10 @@
+@@ -776,10 +785,10 @@
#>+ 3
clean-metasources:
@@ -64098,15 +68087,15 @@
docs-am:
--- kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
-@@ -135,6 +135,7 @@
+@@ -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@
-@@ -231,6 +232,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -233,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64116,7 +68105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -274,6 +278,7 @@
+@@ -280,6 +284,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64124,7 +68113,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -285,12 +290,9 @@
+@@ -291,12 +296,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64137,9 +68126,9 @@
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@
+@@ -317,10 +319,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64151,7 +68140,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -321,6 +326,7 @@
+@@ -329,6 +334,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64159,7 +68148,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -397,12 +403,15 @@
+@@ -409,12 +415,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64175,7 +68164,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -439,7 +448,7 @@
+@@ -451,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -64184,7 +68173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +486,9 @@
+@@ -489,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64198,15 +68187,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/include/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/include/Makefile.in
-@@ -134,6 +134,7 @@
+@@ -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@
-@@ -230,6 +231,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -232,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64216,7 +68205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -273,6 +277,7 @@
+@@ -279,6 +283,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64224,7 +68213,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -284,12 +289,9 @@
+@@ -290,12 +295,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64237,9 +68226,9 @@
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@
+@@ -316,10 +318,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64251,7 +68240,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -320,6 +325,7 @@
+@@ -328,6 +333,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64259,7 +68248,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -396,12 +402,15 @@
+@@ -408,12 +414,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64275,7 +68264,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -433,7 +442,7 @@
+@@ -445,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -64284,7 +68273,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +480,9 @@
+@@ -483,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64298,15 +68287,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
-@@ -135,6 +135,7 @@
+@@ -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@
-@@ -231,6 +232,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -233,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64316,7 +68305,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -274,6 +278,7 @@
+@@ -280,6 +284,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64324,7 +68313,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -285,12 +290,9 @@
+@@ -291,12 +296,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64337,9 +68326,9 @@
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@
+@@ -317,10 +319,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64351,7 +68340,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -321,6 +326,7 @@
+@@ -329,6 +334,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64359,7 +68348,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -397,12 +403,15 @@
+@@ -409,12 +415,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64375,7 +68364,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -437,7 +446,7 @@
+@@ -449,7 +458,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -64384,7 +68373,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +484,9 @@
+@@ -487,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64398,15 +68387,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64416,7 +68405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64424,7 +68413,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64437,9 +68426,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64451,7 +68440,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64459,7 +68448,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64475,7 +68464,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -64484,7 +68473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64498,15 +68487,15 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
-@@ -146,6 +146,7 @@
+@@ -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@
-@@ -242,6 +243,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -244,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64516,7 +68505,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -285,6 +289,7 @@
+@@ -291,6 +295,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64524,7 +68513,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -296,12 +301,9 @@
+@@ -302,12 +307,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64537,9 +68526,9 @@
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@
+@@ -328,10 +330,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64551,7 +68540,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -332,6 +337,7 @@
+@@ -340,6 +345,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64559,7 +68548,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -408,12 +414,15 @@
+@@ -420,12 +426,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64575,7 +68564,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -463,7 +472,7 @@
+@@ -475,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -64584,7 +68573,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +510,9 @@
+@@ -513,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64598,15 +68587,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
-@@ -133,6 +133,7 @@
+@@ -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@
-@@ -229,6 +230,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -231,6 +232,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64616,7 +68605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,6 +276,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64624,7 +68613,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -283,12 +288,9 @@
+@@ -289,12 +294,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64637,9 +68626,9 @@
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@
+@@ -315,10 +317,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64651,7 +68640,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -319,6 +324,7 @@
+@@ -327,6 +332,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64659,7 +68648,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -395,12 +401,15 @@
+@@ -407,12 +413,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64675,7 +68664,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -438,7 +447,7 @@
+@@ -450,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -64684,7 +68673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +485,9 @@
+@@ -488,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64698,15 +68687,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/Makefile.in
+++ kopete/protocols/jabber/libiris/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64716,7 +68705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64724,7 +68713,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64737,9 +68726,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64751,7 +68740,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64759,7 +68748,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64775,7 +68764,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -64784,7 +68773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64798,15 +68787,15 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/qca/Makefile.in
+++ kopete/protocols/jabber/libiris/qca/Makefile.in
-@@ -117,6 +117,7 @@
+@@ -120,6 +120,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -215,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64816,7 +68805,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -256,6 +260,7 @@
+@@ -262,6 +266,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64824,7 +68813,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -267,12 +272,9 @@
+@@ -273,12 +278,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64837,9 +68826,9 @@
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@
+@@ -299,10 +301,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64851,7 +68840,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -303,6 +308,7 @@
+@@ -311,6 +316,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64859,7 +68848,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -379,12 +385,15 @@
+@@ -391,12 +397,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64875,7 +68864,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -64884,7 +68873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64898,15 +68887,15 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/qca/src/Makefile.in
+++ kopete/protocols/jabber/libiris/qca/src/Makefile.in
-@@ -130,6 +130,7 @@
+@@ -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@
-@@ -226,6 +227,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -228,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -64916,7 +68905,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,6 +273,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -64924,7 +68913,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -280,12 +285,9 @@
+@@ -286,12 +291,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -64937,9 +68926,9 @@
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@
+@@ -312,10 +314,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -64951,7 +68940,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -316,6 +321,7 @@
+@@ -324,6 +329,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -64959,7 +68948,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -392,12 +398,15 @@
+@@ -404,12 +410,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -64975,7 +68964,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -429,7 +438,7 @@
+@@ -441,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -64984,7 +68973,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +476,9 @@
+@@ -479,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64998,15 +68987,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/Makefile.in
+++ kopete/protocols/jabber/Makefile.in
-@@ -193,6 +193,7 @@
+@@ -202,6 +202,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -297,6 +298,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65016,7 +69005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -332,6 +336,7 @@
+@@ -344,6 +348,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65024,7 +69013,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -343,12 +348,9 @@
+@@ -355,12 +360,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -65037,9 +69026,9 @@
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@
+@@ -381,10 +383,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -65051,7 +69040,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -379,6 +384,7 @@
+@@ -393,6 +398,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -65059,7 +69048,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -455,12 +461,15 @@
+@@ -473,12 +479,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -65075,7 +69064,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -541,7 +550,7 @@
+@@ -568,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -65084,7 +69073,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +588,9 @@
+@@ -606,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65096,7 +69085,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1054,18 +1063,18 @@
+@@ -1111,18 +1120,18 @@
mocs: jabbergroupchatmanager.moc
#>+ 3
@@ -65121,35 +69110,35 @@
#>+ 3
jabberprotocol.moc: $(srcdir)/jabberprotocol.h
-@@ -1118,7 +1127,7 @@
+@@ -1189,7 +1198,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
+- -rm -f jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberclient.moc jabberformlineedit.moc jabberbookmarks.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercapabilitiesmanager.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbertransport.moc jabbergroupmembercontact.moc
++ -rm -f jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberclient.moc jabberformlineedit.moc jabberbookmarks.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercapabilitiesmanager.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbertransport.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 +1178,7 @@
+ KDE_DIST=jabberformtranslator.h jabbercapabilitiesmanager.h jabberbookmarks.h kopete_jabber.desktop jabberbasecontact.h jabberprotocol.h jabberchatsession.h jabberaccount.h jabberfiletransfer.h jabberresource.h Makefile.in jabberchatui.rc jabberconnector.h jabbercontactpool.h jabbertransport.h jabbergroupchatmanager.h Makefile.am jabberbytestream.h jabberformlineedit.h jabbergroupmembercontact.h
+@@ -1240,7 +1249,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
+-kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp $(srcdir)/jabbercapabilitiesmanager.cpp $(srcdir)/jabbertransport.cpp $(srcdir)/jabberbookmarks.cpp jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberbookmarks.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercapabilitiesmanager.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabbertransport.moc jabbergroupmembercontact.moc
++kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp $(srcdir)/jabbercapabilitiesmanager.cpp $(srcdir)/jabbertransport.cpp $(srcdir)/jabberbookmarks.cpp jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberbookmarks.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercapabilitiesmanager.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabbertransport.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
-@@ -141,6 +141,7 @@
+@@ -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@
-@@ -237,6 +238,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -244,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65159,7 +69148,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -280,6 +284,7 @@
+@@ -291,6 +295,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65167,7 +69156,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -291,12 +296,9 @@
+@@ -302,12 +307,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -65180,9 +69169,9 @@
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@
+@@ -328,10 +330,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -65194,7 +69183,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -327,6 +332,7 @@
+@@ -340,6 +345,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -65202,7 +69191,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -403,12 +409,15 @@
+@@ -420,12 +426,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -65218,7 +69207,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -482,7 +491,7 @@
+@@ -488,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -65227,7 +69216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,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
@@ -65239,7 +69228,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -783,13 +792,6 @@
+@@ -797,13 +806,6 @@
mocs: dlgjabbervcard.moc
#>+ 3
@@ -65253,7 +69242,7 @@
dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
-@@ -804,6 +806,13 @@
+@@ -818,6 +820,13 @@
mocs: dlgjabberchangepassword.moc
#>+ 3
@@ -65267,7 +69256,7 @@
dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
$(MOC) $(srcdir)/dlgjabberchatjoin.h -o dlgjabberchatjoin.moc
-@@ -825,22 +834,22 @@
+@@ -839,22 +848,22 @@
mocs: dlgjabberservices.moc
#>+ 3
@@ -65292,31 +69281,31 @@
#>+ 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
+- -rm -f jabbereditaccountwidget.moc dlgjabberchatroomslist.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 dlgjabberchatroomslist.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 +911,7 @@
+ KDE_DIST=dlgjabberregister.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgchangepassword.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in dlgchatroomslist.ui jabbereditaccountwidget.h dlgjabberchangepassword.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h
+@@ -917,7 +926,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
+-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)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/dlgjabberchangepassword.cpp $(srcdir)/empty.cpp $(srcdir)/dlgjabberchatroomslist.cpp $(srcdir)/dlgjabberchatjoin.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgregister.cpp dlgbrowse.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp dlgchangepassword.cpp dlgchatroomslist.cpp dlgchatjoin.cpp dlgservices.cpp dlgchatjoin.moc dlgsendraw.moc dlgjabberchatroomslist.moc dlgchatroomslist.moc dlgaddcontact.moc dlgservices.moc dlgjabberchooseserver.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)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/dlgjabberchangepassword.cpp $(srcdir)/empty.cpp $(srcdir)/dlgjabberchatroomslist.cpp $(srcdir)/dlgjabberchatjoin.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgregister.cpp dlgbrowse.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp dlgchangepassword.cpp dlgchatroomslist.cpp dlgchatjoin.cpp dlgservices.cpp dlgchatjoin.moc dlgsendraw.moc dlgjabberchatroomslist.moc dlgchatroomslist.moc dlgaddcontact.moc dlgservices.moc dlgjabberchooseserver.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
-@@ -117,6 +117,7 @@
+@@ -120,6 +120,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -215,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65326,7 +69315,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -256,6 +260,7 @@
+@@ -262,6 +266,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65334,7 +69323,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -267,12 +272,9 @@
+@@ -273,12 +278,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -65347,9 +69336,9 @@
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@
+@@ -299,10 +301,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -65361,7 +69350,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -303,6 +308,7 @@
+@@ -311,6 +316,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -65369,7 +69358,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -379,12 +385,15 @@
+@@ -391,12 +397,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -65385,7 +69374,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -414,7 +423,7 @@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -65394,7 +69383,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +461,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65408,15 +69397,15 @@
mostlyclean-libtool:
--- kopete/protocols/meanwhile/icons/Makefile.in
+++ kopete/protocols/meanwhile/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65426,7 +69415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65434,7 +69423,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -65447,9 +69436,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -65461,7 +69450,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -65469,7 +69458,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -65485,7 +69474,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -65494,7 +69483,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65506,7 +69495,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -586,36 +595,36 @@
+@@ -598,36 +607,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
@@ -65558,37 +69547,15 @@
force-reedit:
--- kopete/protocols/meanwhile/Makefile.in
+++ kopete/protocols/meanwhile/Makefile.in
-@@ -64,18 +64,17 @@
- am__DEPENDENCIES_1 =
- kopete_meanwhile_la_DEPENDENCIES = \
- $(top_builddir)/kopete/libkopete/libkopete.la \
-- ui/libkopetemeanwhileui.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
-+ ui/libkopetemeanwhileui.la $(am__DEPENDENCIES_1)
- am_kopete_meanwhile_la_OBJECTS = meanwhileprotocol.lo \
- meanwhileaddcontactpage.lo meanwhileeditaccountwidget.lo \
-- meanwhileaccount.lo meanwhilecontact.lo meanwhilelibrary.lo \
-+ meanwhileaccount.lo meanwhilecontact.lo meanwhilesession.lo \
- meanwhileplugin.lo
- #>- kopete_meanwhile_la_OBJECTS = $(am_kopete_meanwhile_la_OBJECTS)
- #>+ 7
- kopete_meanwhile_la_final_OBJECTS = kopete_meanwhile_la.all_cpp.lo
- kopete_meanwhile_la_nofinal_OBJECTS = meanwhileprotocol.lo \
- meanwhileaddcontactpage.lo meanwhileeditaccountwidget.lo \
-- meanwhileaccount.lo meanwhilecontact.lo meanwhilelibrary.lo \
-+ meanwhileaccount.lo meanwhilecontact.lo meanwhilesession.lo \
- 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)
-@@ -172,6 +171,7 @@
+@@ -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@
-@@ -268,6 +268,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -269,6 +270,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65598,7 +69565,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -311,6 +314,7 @@
+@@ -316,6 +320,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65606,7 +69573,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -322,12 +326,9 @@
+@@ -327,12 +332,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -65619,9 +69586,9 @@
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@
+@@ -353,10 +355,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -65633,7 +69600,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -358,6 +362,7 @@
+@@ -365,6 +370,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -65641,7 +69608,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -434,12 +439,15 @@
+@@ -445,12 +451,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -65657,43 +69624,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -465,7 +473,6 @@
- -I$(srcdir)/ui \
- -I./ui \
- $(all_includes) \
-- $(GLIB_CFLAGS) \
- $(MEANWHILE_CFLAGS)
+@@ -514,7 +523,7 @@
- noinst_HEADERS = \
-@@ -474,7 +481,7 @@
- meanwhileeditaccountwidget.h \
- meanwhileaccount.h \
- meanwhilecontact.h \
-- meanwhilelibrary.h \
-+ meanwhilesession.h \
- meanwhileplugin.h
-
- kde_module_LTLIBRARIES = kopete_meanwhile.la
-@@ -484,7 +491,7 @@
- meanwhileeditaccountwidget.cpp \
- meanwhileaccount.cpp \
- meanwhilecontact.cpp \
-- meanwhilelibrary.cpp \
-+ meanwhilesession.cpp \
- meanwhileplugin.cpp
-
- #>- kopete_meanwhile_la_LDFLAGS = -no-undefined -module \
-@@ -494,7 +501,7 @@
- $(KDE_PLUGIN) $(all_libraries)
-
- kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
-- ui/libkopetemeanwhileui.la $(GLIB_LIBS) $(MEANWHILE_LIBS)
-+ ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS)
-
- service_DATA = kopete_meanwhile.desktop
- servicedir = $(kde_servicesdir)
-@@ -504,7 +511,7 @@
-
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -65701,7 +69633,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +549,9 @@
+@@ -552,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65713,91 +69645,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -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@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhilelibrary.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileplugin.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileprotocol.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhilesession.Plo at am__quote@
-
- .cpp.o:
- @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -961,6 +968,13 @@
- mocs: meanwhileeditaccountwidget.moc
-
- #>+ 3
-+meanwhilesession.moc: $(srcdir)/meanwhilesession.h
-+ $(MOC) $(srcdir)/meanwhilesession.h -o meanwhilesession.moc
-+
-+#>+ 2
-+mocs: meanwhilesession.moc
-+
-+#>+ 3
- meanwhileprotocol.moc: $(srcdir)/meanwhileprotocol.h
- $(MOC) $(srcdir)/meanwhileprotocol.h -o meanwhileprotocol.moc
-
-@@ -975,15 +989,8 @@
- mocs: meanwhileaccount.moc
-
- #>+ 3
--meanwhilelibrary.moc: $(srcdir)/meanwhilelibrary.h
-- $(MOC) $(srcdir)/meanwhilelibrary.h -o meanwhilelibrary.moc
--
--#>+ 2
--mocs: meanwhilelibrary.moc
--
--#>+ 3
- clean-metasources:
-- -rm -f meanwhilecontact.moc meanwhileaddcontactpage.moc meanwhileeditaccountwidget.moc meanwhileprotocol.moc meanwhileaccount.moc meanwhilelibrary.moc
-+ -rm -f meanwhilecontact.moc meanwhileaddcontactpage.moc meanwhileeditaccountwidget.moc meanwhilesession.moc meanwhileprotocol.moc meanwhileaccount.moc
-
- #>+ 2
- KDE_DIST=meanwhileserver.h log.h meanwhileserver.cpp kopete_meanwhile.desktop Makefile.in Makefile.am
-@@ -1034,11 +1041,11 @@
-
-
- #>+ 11
--kopete_meanwhile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/meanwhileprotocol.cpp $(srcdir)/meanwhileaddcontactpage.cpp $(srcdir)/meanwhileeditaccountwidget.cpp $(srcdir)/meanwhileaccount.cpp $(srcdir)/meanwhilecontact.cpp $(srcdir)/meanwhilelibrary.cpp $(srcdir)/meanwhileplugin.cpp meanwhileaddcontactpage.moc meanwhilecontact.moc meanwhileeditaccountwidget.moc meanwhileprotocol.moc meanwhilelibrary.moc meanwhileaccount.moc
-+kopete_meanwhile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/meanwhileprotocol.cpp $(srcdir)/meanwhileaddcontactpage.cpp $(srcdir)/meanwhileeditaccountwidget.cpp $(srcdir)/meanwhileaccount.cpp $(srcdir)/meanwhilecontact.cpp $(srcdir)/meanwhilesession.cpp $(srcdir)/meanwhileplugin.cpp meanwhileaddcontactpage.moc meanwhilecontact.moc meanwhileeditaccountwidget.moc meanwhileprotocol.moc meanwhilesession.moc meanwhileaccount.moc
- @echo 'creating kopete_meanwhile_la.all_cpp.cpp ...'; \
- rm -f kopete_meanwhile_la.all_cpp.files kopete_meanwhile_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kopete_meanwhile_la.all_cpp.final; \
-- for file in meanwhileprotocol.cpp meanwhileaddcontactpage.cpp meanwhileeditaccountwidget.cpp meanwhileaccount.cpp meanwhilecontact.cpp meanwhilelibrary.cpp meanwhileplugin.cpp ; do \
-+ for file in meanwhileprotocol.cpp meanwhileaddcontactpage.cpp meanwhileeditaccountwidget.cpp meanwhileaccount.cpp meanwhilecontact.cpp meanwhilesession.cpp meanwhileplugin.cpp ; do \
- 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 +1079,15 @@
- #>+ 15
- meanwhileprotocol.o: meanwhileprotocol.moc
- meanwhileaddcontactpage.o: meanwhileaddcontactpage.moc
--meanwhilelibrary.o: meanwhilelibrary.moc
- meanwhileaccount.lo: meanwhileaccount.moc
- meanwhileeditaccountwidget.lo: meanwhileeditaccountwidget.moc
--meanwhilelibrary.lo: meanwhilelibrary.moc
-+meanwhilesession.o: meanwhilesession.moc
- nmcheck:
- meanwhileeditaccountwidget.o: meanwhileeditaccountwidget.moc
- meanwhileaccount.o: meanwhileaccount.moc
- meanwhileaddcontactpage.lo: meanwhileaddcontactpage.moc
- nmcheck-am: nmcheck
- meanwhileprotocol.lo: meanwhileprotocol.moc
-+meanwhilesession.lo: meanwhilesession.moc
- meanwhilecontact.lo: meanwhilecontact.moc
- meanwhilecontact.o: meanwhilecontact.moc
--- kopete/protocols/meanwhile/ui/Makefile.in
+++ kopete/protocols/meanwhile/ui/Makefile.in
-@@ -134,6 +134,7 @@
+@@ -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@
-@@ -230,6 +231,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -232,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65807,7 +69665,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -273,6 +277,7 @@
+@@ -279,6 +283,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65815,7 +69673,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -284,12 +289,9 @@
+@@ -290,12 +295,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -65828,9 +69686,9 @@
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@
+@@ -316,10 +318,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -65842,7 +69700,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -320,6 +325,7 @@
+@@ -328,6 +333,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -65850,7 +69708,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -396,12 +402,15 @@
+@@ -408,12 +414,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -65866,7 +69724,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -436,7 +445,7 @@
+@@ -448,7 +457,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -65875,7 +69733,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +483,9 @@
+@@ -486,9 +495,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65889,15 +69747,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/msn/config/Makefile.in
+++ kopete/protocols/msn/config/Makefile.in
-@@ -147,6 +147,7 @@
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -245,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -65907,7 +69765,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -292,6 +296,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -65915,7 +69773,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -303,12 +308,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -65928,9 +69786,9 @@
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@
+@@ -329,10 +331,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -65942,7 +69800,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -65950,7 +69808,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -421,12 +427,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -65966,7 +69824,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -452,7 +461,7 @@
+@@ -464,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -65975,7 +69833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +499,9 @@
+@@ -502,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -65989,15 +69847,15 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/msn/icons/Makefile.in
+++ kopete/protocols/msn/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66007,7 +69865,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66015,7 +69873,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66028,9 +69886,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66042,7 +69900,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66050,7 +69908,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66066,7 +69924,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -66075,7 +69933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66087,7 +69945,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -585,47 +594,47 @@
+@@ -597,47 +606,47 @@
#>+ 44
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -66166,15 +70024,15 @@
force-reedit:
--- kopete/protocols/msn/Makefile.in
+++ kopete/protocols/msn/Makefile.in
-@@ -188,6 +188,7 @@
+@@ -191,6 +191,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -286,6 +287,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66184,7 +70042,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -333,6 +337,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66192,7 +70050,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -338,12 +343,9 @@
+@@ -344,12 +349,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66205,9 +70063,9 @@
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@
+@@ -370,10 +372,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66219,7 +70077,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -374,6 +379,7 @@
+@@ -382,6 +387,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66227,7 +70085,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -450,12 +456,15 @@
+@@ -462,12 +468,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66243,7 +70101,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -530,7 +539,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -66252,7 +70110,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -568,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66264,7 +70122,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1070,18 +1079,18 @@
+@@ -1089,18 +1098,18 @@
mocs: msndebugrawcmddlg.moc
#>+ 3
@@ -66289,67 +70147,64 @@
#>+ 3
msnprotocol.moc: $(srcdir)/msnprotocol.h
-@@ -1133,11 +1142,11 @@
+@@ -1152,6 +1161,13 @@
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: dispatcher.moc
++
++#>+ 3
+ webcam.moc: $(srcdir)/webcam.h
+ $(MOC) $(srcdir)/webcam.h -o webcam.moc
+@@ -1165,13 +1181,6 @@
#>+ 2
--mocs: webcam.moc
-+mocs: dispatcher.moc
-
- #>+ 3
- messageformatter.moc: $(srcdir)/messageformatter.h
-@@ -1147,11 +1156,11 @@
mocs: messageformatter.moc
- #>+ 3
+-#>+ 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
+-
+-#>+ 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 +1173,7 @@
+ @echo "int main() {return 0;}" > libkopete_msn_shared_la_closure.cpp
+@@ -1183,7 +1192,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
+- -rm -f transport.moc 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 transport.moc 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 webcam.moc messageformatter.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 +1265,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
+ KDE_DIST=kopete_msn.desktop msncontact.h msnchatui.rc transport.h Changelog msnsocket.h msnsecureloginhandler.h ReleaseNotes msnchallengehandler.h transport.cpp msnchatsession.h msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
+@@ -1289,8 +1298,8 @@
+ msnaddcontactpage.o: msnaddcontactpage.moc
+ msnsocket.o: msnsocket.moc
+ msnnotifysocket.o: msnnotifysocket.moc
+-msnfiletransfersocket.lo: msnfiletransfersocket.moc
+ msnaddcontactpage.lo: msnaddcontactpage.moc
++msnfiletransfersocket.lo: msnfiletransfersocket.moc
+ msnchatsession.lo: msnchatsession.moc
+ outgoingtransfer.o: outgoingtransfer.moc
+ dispatcher.o: dispatcher.moc
--- kopete/protocols/msn/ui/Makefile.in
+++ kopete/protocols/msn/ui/Makefile.in
-@@ -133,6 +133,7 @@
+@@ -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@
-@@ -229,6 +230,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -231,6 +232,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66359,7 +70214,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,6 +276,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66367,7 +70222,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -283,12 +288,9 @@
+@@ -289,12 +294,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66380,9 +70235,9 @@
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@
+@@ -315,10 +317,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66394,7 +70249,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -319,6 +324,7 @@
+@@ -327,6 +332,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66402,7 +70257,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -395,12 +401,15 @@
+@@ -407,12 +413,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66418,7 +70273,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -439,7 +448,7 @@
+@@ -451,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -66427,7 +70282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +486,9 @@
+@@ -489,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66441,15 +70296,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/msn/webcam/libmimic/Makefile.in
+++ kopete/protocols/msn/webcam/libmimic/Makefile.in
-@@ -128,6 +128,7 @@
+@@ -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@
-@@ -224,6 +225,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -226,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66459,7 +70314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -267,6 +271,7 @@
+@@ -273,6 +277,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66467,7 +70322,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -278,12 +283,9 @@
+@@ -284,12 +289,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66480,9 +70335,9 @@
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@
+@@ -310,10 +312,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66494,7 +70349,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -314,6 +319,7 @@
+@@ -322,6 +327,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66502,7 +70357,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -390,12 +396,15 @@
+@@ -402,12 +408,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66518,7 +70373,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -442,7 +451,7 @@
+@@ -454,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -66527,7 +70382,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +489,9 @@
+@@ -492,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66541,15 +70396,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/msn/webcam/Makefile.in
+++ kopete/protocols/msn/webcam/Makefile.in
-@@ -147,6 +147,7 @@
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -245,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66559,7 +70414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -292,6 +296,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66567,7 +70422,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -303,12 +308,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66580,9 +70435,9 @@
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@
+@@ -329,10 +331,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66594,7 +70449,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66602,7 +70457,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -421,12 +427,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66618,7 +70473,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -453,7 +462,7 @@
+@@ -465,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -66627,7 +70482,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +500,9 @@
+@@ -503,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66639,7 +70494,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -850,7 +859,7 @@
+@@ -862,7 +871,7 @@
-rm -f msnwebcamdialog.moc
#>+ 2
@@ -66650,15 +70505,15 @@
clean-closures:
--- kopete/protocols/oscar/aim/Makefile.in
+++ kopete/protocols/oscar/aim/Makefile.in
-@@ -163,6 +163,7 @@
+@@ -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@
-@@ -259,6 +260,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -261,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66668,7 +70523,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,6 +306,7 @@
+@@ -308,6 +312,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66676,7 +70531,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -313,12 +318,9 @@
+@@ -319,12 +324,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66689,9 +70544,9 @@
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@
+@@ -345,10 +347,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66703,7 +70558,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -349,6 +354,7 @@
+@@ -357,6 +362,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66711,7 +70566,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -425,12 +431,15 @@
+@@ -437,12 +443,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66727,7 +70582,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -474,7 +483,7 @@
+@@ -486,7 +495,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -66736,7 +70591,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +521,9 @@
+@@ -524,9 +533,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66748,7 +70603,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -929,22 +938,22 @@
+@@ -942,18 +951,18 @@
mocs: aimaccount.moc
#>+ 3
@@ -66772,25 +70627,29 @@
+mocs: aimprotocol.moc
#>+ 3
+ aimchatsession.moc: $(srcdir)/aimchatsession.h
+@@ -964,7 +973,7 @@
+
+ #>+ 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
+- -rm -f aimuserinfo.moc aimcontact.moc aimaccount.moc aimprotocol.moc aimjoinchat.moc aimchatsession.moc
++ -rm -f aimuserinfo.moc aimcontact.moc aimaccount.moc aimjoinchat.moc aimprotocol.moc aimchatsession.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 +1004,7 @@
+ KDE_DIST=aimchatsession.h aimuserinfo.h kopete_aim.desktop aim.protocol aimcontact.h aimaccount.h Makefile.in aimjoinchat.h Makefile.am aimprotocol.h
+@@ -1015,7 +1024,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
+-kopete_aim_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/aimprotocol.cpp $(srcdir)/aimaccount.cpp $(srcdir)/aimcontact.cpp $(srcdir)/aimuserinfo.cpp $(srcdir)/aimjoinchat.cpp $(srcdir)/aimchatsession.cpp aimuserinfo.moc aimcontact.moc aimaccount.moc aimjoinchat.moc aimprotocol.moc aimchatsession.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 $(srcdir)/aimchatsession.cpp aimuserinfo.moc aimcontact.moc aimaccount.moc aimprotocol.moc aimjoinchat.moc aimchatsession.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 +1042,9 @@
- #>+ 13
+@@ -1054,9 +1063,9 @@
aimcontact.o: aimcontact.moc
aimjoinchat.o: aimjoinchat.moc
+ aimchatsession.o: aimchatsession.moc
-aimjoinchat.lo: aimjoinchat.moc
aimcontact.lo: aimcontact.moc
aimaccount.lo: aimaccount.moc
@@ -66800,15 +70659,15 @@
aimuserinfo.o: aimuserinfo.moc
--- kopete/protocols/oscar/aim/ui/Makefile.in
+++ kopete/protocols/oscar/aim/ui/Makefile.in
-@@ -136,6 +136,7 @@
+@@ -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@
-@@ -232,6 +233,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -234,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66818,7 +70677,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -275,6 +279,7 @@
+@@ -281,6 +285,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66826,7 +70685,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -286,12 +291,9 @@
+@@ -292,12 +297,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66839,9 +70698,9 @@
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@
+@@ -318,10 +320,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66853,7 +70712,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -322,6 +327,7 @@
+@@ -330,6 +335,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66861,7 +70720,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -398,12 +404,15 @@
+@@ -410,12 +416,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66877,7 +70736,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -444,7 +453,7 @@
+@@ -456,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -66886,7 +70745,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +491,9 @@
+@@ -494,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66900,15 +70759,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/oscar/icons/Makefile.in
+++ kopete/protocols/oscar/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -66918,7 +70777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -66926,7 +70785,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -66939,9 +70798,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -66953,7 +70812,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -66961,7 +70820,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -66977,7 +70836,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -66986,7 +70845,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -66998,7 +70857,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +586,7 @@
+@@ -589,7 +598,7 @@
.NOEXPORT:
#>+ 2
@@ -67007,7 +70866,7 @@
#>+ 2
docs-am:
-@@ -585,96 +594,96 @@
+@@ -597,96 +606,96 @@
#>+ 93
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
@@ -67171,15 +71030,15 @@
force-reedit:
--- kopete/protocols/oscar/icq/Makefile.in
+++ kopete/protocols/oscar/icq/Makefile.in
-@@ -164,6 +164,7 @@
+@@ -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@
-@@ -260,6 +261,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -262,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67189,7 +71048,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -303,6 +307,7 @@
+@@ -309,6 +313,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67197,7 +71056,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -314,12 +319,9 @@
+@@ -320,12 +325,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -67210,9 +71069,9 @@
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@
+@@ -346,10 +348,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -67224,7 +71083,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -350,6 +355,7 @@
+@@ -358,6 +363,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -67232,7 +71091,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -426,12 +432,15 @@
+@@ -438,12 +444,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -67248,7 +71107,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -478,7 +487,7 @@
+@@ -490,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -67257,7 +71116,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +525,9 @@
+@@ -528,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67271,15 +71130,15 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/oscar/icq/ui/Makefile.in
+++ kopete/protocols/oscar/icq/ui/Makefile.in
-@@ -146,6 +146,7 @@
+@@ -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@
-@@ -242,6 +243,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -244,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67289,7 +71148,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -285,6 +289,7 @@
+@@ -291,6 +295,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67297,7 +71156,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -296,12 +301,9 @@
+@@ -302,12 +307,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -67310,9 +71169,9 @@
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@
+@@ -328,10 +330,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -67324,7 +71183,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -332,6 +337,7 @@
+@@ -340,6 +345,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -67332,7 +71191,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -408,12 +414,15 @@
+@@ -420,12 +426,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -67348,7 +71207,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -459,7 +468,7 @@
+@@ -471,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -67357,7 +71216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +506,9 @@
+@@ -509,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67369,7 +71228,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -771,7 +780,7 @@
+@@ -783,7 +792,7 @@
-rm -f icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
#>+ 2
@@ -67380,15 +71239,15 @@
clean-ui:
--- kopete/protocols/oscar/liboscar/Makefile.in
+++ kopete/protocols/oscar/liboscar/Makefile.in
-@@ -182,6 +182,7 @@
+@@ -185,6 +185,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -280,6 +281,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67398,7 +71257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -321,6 +325,7 @@
+@@ -327,6 +331,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67406,7 +71265,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -332,12 +337,9 @@
+@@ -338,12 +343,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -67419,9 +71278,9 @@
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@
+@@ -364,10 +366,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -67433,7 +71292,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -368,6 +373,7 @@
+@@ -376,6 +381,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -67441,7 +71300,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -444,12 +450,15 @@
+@@ -456,12 +462,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -67457,7 +71316,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -498,7 +507,7 @@
+@@ -510,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -67466,7 +71325,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +545,9 @@
+@@ -548,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67478,7 +71337,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -914,18 +923,18 @@
+@@ -926,18 +935,18 @@
mocs: servicesetuptask.moc
#>+ 3
@@ -67503,7 +71362,7 @@
#>+ 3
bytestream.moc: $(srcdir)/bytestream.h
-@@ -984,13 +993,6 @@
+@@ -1003,13 +1012,6 @@
mocs: rateclass.moc
#>+ 3
@@ -67517,7 +71376,7 @@
snacprotocol.moc: $(srcdir)/snacprotocol.h
$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
-@@ -1005,6 +1007,13 @@
+@@ -1024,6 +1026,13 @@
mocs: rateinfotask.moc
#>+ 3
@@ -67531,7 +71390,7 @@
safedelete.moc: $(srcdir)/safedelete.h
$(MOC) $(srcdir)/safedelete.h -o safedelete.moc
-@@ -1026,18 +1035,18 @@
+@@ -1045,18 +1054,18 @@
mocs: userinfotask.moc
#>+ 3
@@ -67556,12 +71415,12 @@
#>+ 3
warningtask.moc: $(srcdir)/warningtask.h
-@@ -1153,10 +1162,10 @@
+@@ -1172,10 +1181,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
+- -rm -f oscarconnector.moc serverredirecttask.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc chatnavservicetask.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 chatnavservicetask.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
@@ -67569,26 +71428,26 @@
#>+ 3
clean-closures:
-@@ -1204,7 +1213,7 @@
+@@ -1223,7 +1232,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
+-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 chatnavservicetask.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc rateinfotask.moc snacprotocol.moc ownuserinfotask.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 chatnavservicetask.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc rateinfotask.moc snacprotocol.moc safedelete.moc userinfotask.moc icqlogintask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc 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
-@@ -179,6 +179,7 @@
+@@ -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@
-@@ -275,6 +276,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -277,6 +278,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67598,7 +71457,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -318,6 +322,7 @@
+@@ -324,6 +328,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67606,7 +71465,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -329,12 +334,9 @@
+@@ -335,12 +340,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -67619,9 +71478,9 @@
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@
+@@ -361,10 +363,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -67633,7 +71492,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -365,6 +370,7 @@
+@@ -373,6 +378,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -67641,7 +71500,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -441,12 +447,15 @@
+@@ -453,12 +459,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -67657,7 +71516,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -489,7 +498,7 @@
+@@ -501,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -67666,7 +71525,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +536,9 @@
+@@ -539,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67678,7 +71537,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -787,13 +796,6 @@
+@@ -799,13 +808,6 @@
.NOEXPORT:
#>+ 3
@@ -67692,7 +71551,7 @@
logintest.moc: $(srcdir)/logintest.h
$(MOC) $(srcdir)/logintest.h -o logintest.moc
-@@ -801,11 +803,11 @@
+@@ -813,11 +815,11 @@
mocs: logintest.moc
#>+ 3
@@ -67707,7 +71566,7 @@
#>+ 3
userinfotest.moc: $(srcdir)/userinfotest.h
-@@ -815,6 +817,13 @@
+@@ -827,6 +829,13 @@
mocs: userinfotest.moc
#>+ 3
@@ -67721,7 +71580,7 @@
kunittest.moc: $(srcdir)/kunittest.h
$(MOC) $(srcdir)/kunittest.h -o kunittest.moc
-@@ -830,7 +839,7 @@
+@@ -842,7 +851,7 @@
#>+ 3
clean-metasources:
@@ -67732,15 +71591,15 @@
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
-@@ -162,6 +162,7 @@
+@@ -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@
-@@ -258,6 +259,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -262,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67750,7 +71609,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -309,6 +313,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67758,7 +71617,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -312,12 +317,9 @@
+@@ -320,12 +325,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -67771,9 +71630,9 @@
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@
+@@ -346,10 +348,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -67785,7 +71644,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -348,6 +353,7 @@
+@@ -358,6 +363,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -67793,7 +71652,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -424,12 +430,15 @@
+@@ -438,12 +444,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -67809,7 +71668,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -474,7 +483,7 @@
+@@ -492,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -67818,7 +71677,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +521,9 @@
+@@ -530,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67830,17 +71689,60 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -940,25 +949,25 @@
+ mocs: oscaraccount.moc
+
+ #>+ 3
+-oscarversionupdater.moc: $(srcdir)/oscarversionupdater.h
+- $(MOC) $(srcdir)/oscarversionupdater.h -o oscarversionupdater.moc
++oscarvisibilitydialog.moc: $(srcdir)/oscarvisibilitydialog.h
++ $(MOC) $(srcdir)/oscarvisibilitydialog.h -o oscarvisibilitydialog.moc
+
+ #>+ 2
+-mocs: oscarversionupdater.moc
++mocs: oscarvisibilitydialog.moc
+
+ #>+ 3
+-oscarvisibilitydialog.moc: $(srcdir)/oscarvisibilitydialog.h
+- $(MOC) $(srcdir)/oscarvisibilitydialog.h -o oscarvisibilitydialog.moc
++oscarversionupdater.moc: $(srcdir)/oscarversionupdater.h
++ $(MOC) $(srcdir)/oscarversionupdater.h -o oscarversionupdater.moc
+
+ #>+ 2
+-mocs: oscarvisibilitydialog.moc
++mocs: oscarversionupdater.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f oscarcontact.moc oscarlistnonservercontacts.moc oscarencodingselectiondialog.moc oscarmyselfcontact.moc oscaraccount.moc oscarversionupdater.moc oscarvisibilitydialog.moc
++ -rm -f oscarcontact.moc oscarlistnonservercontacts.moc oscarencodingselectiondialog.moc oscarmyselfcontact.moc oscaraccount.moc oscarvisibilitydialog.moc oscarversionupdater.moc
+
+ #>+ 2
+-KDE_DIST=oscarcontact.h oscarlistcontactsbase.ui oscarmyselfcontact.h oscarversionupdater.h oscarencodingselectiondialog.h oscarvisibilitybase.ui oscarencodingselectionbase.ui oscarlistnonservercontacts.h Makefile.in oscarvisibilitydialog.h oscaraccount.h Makefile.am
++KDE_DIST=oscarcontact.h oscarlistcontactsbase.ui oscarmyselfcontact.h oscarencodingselectiondialog.h oscarversionupdater.h oscarvisibilitybase.ui oscarencodingselectionbase.ui oscarlistnonservercontacts.h Makefile.in oscarvisibilitydialog.h oscaraccount.h Makefile.am
+
+ #>+ 6
+ clean-ui:
+@@ -1013,7 +1022,7 @@
+
+
+ #>+ 11
+-libkopete_oscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscaraccount.cpp $(srcdir)/oscarcontact.cpp $(srcdir)/oscarmyselfcontact.cpp $(srcdir)/oscarencodingselectiondialog.cpp $(srcdir)/oscarlistnonservercontacts.cpp $(srcdir)/oscarvisibilitydialog.cpp $(srcdir)/oscarversionupdater.cpp oscarencodingselectionbase.cpp oscarlistcontactsbase.cpp oscarvisibilitybase.cpp oscarcontact.moc oscarlistnonservercontacts.moc oscarlistcontactsbase.moc oscarvisibilitydialog.moc oscarversionupdater.moc oscarencodingselectiondialog.moc oscarmyselfcontact.moc oscarencodingselectionbase.moc oscaraccount.moc oscarvisibilitybase.moc
++libkopete_oscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscaraccount.cpp $(srcdir)/oscarcontact.cpp $(srcdir)/oscarmyselfcontact.cpp $(srcdir)/oscarencodingselectiondialog.cpp $(srcdir)/oscarlistnonservercontacts.cpp $(srcdir)/oscarvisibilitydialog.cpp $(srcdir)/oscarversionupdater.cpp oscarencodingselectionbase.cpp oscarlistcontactsbase.cpp oscarvisibilitybase.cpp oscarcontact.moc oscarlistnonservercontacts.moc oscarlistcontactsbase.moc oscarversionupdater.moc oscarvisibilitydialog.moc oscarencodingselectiondialog.moc oscarmyselfcontact.moc oscarencodingselectionbase.moc oscaraccount.moc oscarvisibilitybase.moc
+ @echo 'creating libkopete_oscar_la.all_cpp.cpp ...'; \
+ rm -f libkopete_oscar_la.all_cpp.files libkopete_oscar_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkopete_oscar_la.all_cpp.final; \
--- kopete/protocols/sms/icons/Makefile.in
+++ kopete/protocols/sms/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67850,7 +71752,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67858,7 +71760,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -67871,9 +71773,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -67885,7 +71787,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -67893,7 +71795,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -67909,7 +71811,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -67918,7 +71820,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -67930,7 +71832,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -586,21 +595,21 @@
+@@ -598,21 +607,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
@@ -67960,15 +71862,15 @@
force-reedit:
--- kopete/protocols/sms/Makefile.in
+++ kopete/protocols/sms/Makefile.in
-@@ -166,6 +166,7 @@
+@@ -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@
-@@ -262,6 +263,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -264,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -67978,7 +71880,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -305,6 +309,7 @@
+@@ -311,6 +315,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -67986,7 +71888,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -316,12 +321,9 @@
+@@ -322,12 +327,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -67999,9 +71901,9 @@
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@
+@@ -348,10 +350,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68013,7 +71915,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -352,6 +357,7 @@
+@@ -360,6 +365,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68021,7 +71923,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -428,12 +434,15 @@
+@@ -440,12 +446,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68037,7 +71939,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -482,7 +491,7 @@
+@@ -494,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -68046,7 +71948,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +529,9 @@
+@@ -532,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68058,7 +71960,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -947,11 +956,11 @@
+@@ -959,11 +968,11 @@
mocs: smsaddcontactpage.moc
#>+ 3
@@ -68073,7 +71975,7 @@
#>+ 3
smscontact.moc: $(srcdir)/smscontact.h
-@@ -961,15 +970,15 @@
+@@ -973,15 +982,15 @@
mocs: smscontact.moc
#>+ 3
@@ -68093,7 +71995,7 @@
#>+ 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 +1029,7 @@
+@@ -1032,7 +1041,7 @@
#>+ 11
@@ -68104,15 +72006,15 @@
echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
--- kopete/protocols/sms/services/Makefile.in
+++ kopete/protocols/sms/services/Makefile.in
-@@ -136,6 +136,7 @@
+@@ -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@
-@@ -232,6 +233,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -234,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68122,7 +72024,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -275,6 +279,7 @@
+@@ -281,6 +285,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68130,7 +72032,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -286,12 +291,9 @@
+@@ -292,12 +297,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68143,9 +72045,9 @@
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@
+@@ -318,10 +320,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68157,7 +72059,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -322,6 +327,7 @@
+@@ -330,6 +335,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68165,7 +72067,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -398,12 +404,15 @@
+@@ -410,12 +416,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68181,7 +72083,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -442,7 +451,7 @@
+@@ -456,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -68190,7 +72092,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +489,9 @@
+@@ -494,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68204,15 +72106,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/sms/ui/Makefile.in
+++ kopete/protocols/sms/ui/Makefile.in
-@@ -133,6 +133,7 @@
+@@ -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@
-@@ -229,6 +230,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -231,6 +232,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68222,7 +72124,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,6 +276,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68230,7 +72132,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -283,12 +288,9 @@
+@@ -289,12 +294,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68243,9 +72145,9 @@
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@
+@@ -315,10 +317,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68257,7 +72159,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -319,6 +324,7 @@
+@@ -327,6 +332,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68265,7 +72167,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -395,12 +401,15 @@
+@@ -407,12 +413,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68281,7 +72183,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -435,7 +444,7 @@
+@@ -447,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -68290,7 +72192,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +482,9 @@
+@@ -485,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68304,15 +72206,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/testbed/icons/Makefile.in
+++ kopete/protocols/testbed/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68322,7 +72224,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68330,7 +72232,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68343,9 +72245,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68357,7 +72259,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68365,7 +72267,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68381,7 +72283,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -68390,7 +72292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68402,7 +72304,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,23 +593,23 @@
+@@ -596,23 +605,23 @@
#>+ 19
install-kde-icons:
@@ -68437,15 +72339,15 @@
force-reedit:
--- kopete/protocols/testbed/Makefile.in
+++ kopete/protocols/testbed/Makefile.in
-@@ -170,6 +170,7 @@
+@@ -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@
-@@ -266,6 +267,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -270,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68455,7 +72357,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,6 +313,7 @@
+@@ -317,6 +321,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68463,7 +72365,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -320,12 +325,9 @@
+@@ -328,12 +333,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68476,9 +72378,9 @@
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@
+@@ -354,10 +356,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68490,7 +72392,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -356,6 +361,7 @@
+@@ -366,6 +371,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68498,7 +72400,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -432,12 +438,15 @@
+@@ -446,12 +452,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68514,7 +72416,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -477,7 +486,7 @@
+@@ -491,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -68523,7 +72425,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +524,9 @@
+@@ -529,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68535,7 +72437,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -927,18 +936,18 @@
+@@ -941,18 +950,18 @@
mocs: testbedprotocol.moc
#>+ 3
@@ -68560,7 +72462,7 @@
#>+ 3
testbedaccount.moc: $(srcdir)/testbedaccount.h
-@@ -963,7 +972,7 @@
+@@ -977,7 +986,7 @@
#>+ 3
clean-metasources:
@@ -68569,7 +72471,7 @@
#>+ 2
KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am
-@@ -1059,8 +1068,8 @@
+@@ -1073,8 +1082,8 @@
testbedcontact.lo: testbedcontact.moc
$(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h
testbedcontact.o: testbedcontact.moc
@@ -68579,17 +72481,17 @@
testbededitaccountwidget.lo: testbededitaccountwidget.moc
nmcheck:
testbedaccount.lo: testbedaccount.moc
---- kopete/protocols/winpopup/config/Makefile.in
-+++ kopete/protocols/winpopup/config/Makefile.in
-@@ -147,6 +147,7 @@
+--- kopete/protocols/testbed/ui/Makefile.in
++++ kopete/protocols/testbed/ui/Makefile.in
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -231,6 +232,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68599,7 +72501,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68607,7 +72509,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -289,12 +294,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68620,9 +72522,9 @@
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@
+@@ -315,10 +317,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68634,7 +72536,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -327,6 +332,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68642,7 +72544,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -407,12 +413,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68658,7 +72560,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -452,7 +461,7 @@
+@@ -445,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -68667,7 +72569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +499,9 @@
+@@ -483,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68677,19 +72579,19 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ clean-noinstLTLIBRARIES:
--- kopete/protocols/winpopup/icons/Makefile.in
+++ kopete/protocols/winpopup/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68699,7 +72601,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68707,7 +72609,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68720,9 +72622,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68734,7 +72636,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68742,7 +72644,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68758,7 +72660,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -68767,7 +72669,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68779,7 +72681,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,26 +593,26 @@
+@@ -596,26 +605,26 @@
#>+ 22
install-kde-icons:
@@ -68814,15 +72716,15 @@
force-reedit:
--- kopete/protocols/winpopup/libwinpopup/Makefile.in
+++ kopete/protocols/winpopup/libwinpopup/Makefile.in
-@@ -130,6 +130,7 @@
+@@ -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@
-@@ -226,6 +227,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -228,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68832,7 +72734,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,6 +273,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68840,7 +72742,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -280,12 +285,9 @@
+@@ -286,12 +291,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68853,9 +72755,9 @@
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@
+@@ -312,10 +314,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68867,7 +72769,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -316,6 +321,7 @@
+@@ -324,6 +329,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68875,7 +72777,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -392,12 +398,15 @@
+@@ -404,12 +410,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68891,7 +72793,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -430,7 +439,7 @@
+@@ -442,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -68900,7 +72802,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +477,9 @@
+@@ -480,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -68914,15 +72816,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/winpopup/Makefile.in
+++ kopete/protocols/winpopup/Makefile.in
-@@ -170,6 +170,7 @@
+@@ -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@
-@@ -266,6 +267,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -268,6 +269,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -68932,7 +72834,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -309,6 +313,7 @@
+@@ -315,6 +319,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -68940,7 +72842,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -320,12 +325,9 @@
+@@ -326,12 +331,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -68953,9 +72855,9 @@
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@
+@@ -352,10 +354,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -68967,7 +72869,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -356,6 +361,7 @@
+@@ -364,6 +369,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -68975,7 +72877,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -432,12 +438,15 @@
+@@ -444,12 +450,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -68991,7 +72893,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -483,7 +492,7 @@
+@@ -495,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -69000,7 +72902,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +530,9 @@
+@@ -533,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69012,7 +72914,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -952,13 +961,6 @@
+@@ -964,13 +973,6 @@
mocs: wpaccount.moc
#>+ 3
@@ -69026,7 +72928,7 @@
wpuserinfo.moc: $(srcdir)/wpuserinfo.h
$(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
-@@ -966,11 +968,11 @@
+@@ -978,11 +980,11 @@
mocs: wpuserinfo.moc
#>+ 3
@@ -69041,7 +72943,7 @@
#>+ 3
wpprotocol.moc: $(srcdir)/wpprotocol.h
-@@ -980,8 +982,15 @@
+@@ -992,8 +994,15 @@
mocs: wpprotocol.moc
#>+ 3
@@ -69058,7 +72960,7 @@
#>+ 2
KDE_DIST=kopete_wp.desktop Makefile.in winpopup-send.sh winpopup-install.sh Makefile.am
-@@ -1032,7 +1041,7 @@
+@@ -1044,7 +1053,7 @@
#>+ 11
@@ -69069,15 +72971,15 @@
echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
--- kopete/protocols/winpopup/ui/Makefile.in
+++ kopete/protocols/winpopup/ui/Makefile.in
-@@ -133,6 +133,7 @@
+@@ -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@
-@@ -229,6 +230,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -231,6 +232,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69087,7 +72989,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -272,6 +276,7 @@
+@@ -278,6 +282,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -69095,7 +72997,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -283,12 +288,9 @@
+@@ -289,12 +294,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -69108,9 +73010,9 @@
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@
+@@ -315,10 +317,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -69122,7 +73024,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -319,6 +324,7 @@
+@@ -327,6 +332,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -69130,7 +73032,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -395,12 +401,15 @@
+@@ -407,12 +413,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -69146,7 +73048,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -436,7 +445,7 @@
+@@ -448,7 +457,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -69155,7 +73057,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +483,9 @@
+@@ -486,9 +495,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69169,15 +73071,15 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/yahoo/icons/Makefile.in
+++ kopete/protocols/yahoo/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69187,7 +73089,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -69195,7 +73097,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -69208,9 +73110,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -69222,7 +73124,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -69230,7 +73132,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -69246,7 +73148,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -394,7 +403,7 @@
+@@ -406,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -69255,7 +73157,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +441,9 @@
+@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69267,8 +73169,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -585,37 +594,37 @@
- #>+ 34
+@@ -597,45 +606,45 @@
+ #>+ 42
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
@@ -69277,10 +73179,15 @@
+ $(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/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-yahoo_stealthed.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/yahoo_stealthed.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_stealthed.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_stealthed.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
++ $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-yahoo_stealthed.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/yahoo_stealthed.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
@@ -69295,6 +73202,11 @@
$(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
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-yahoo_stealthed.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/yahoo_stealthed.png
+- $(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-yahoo_stealthed.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/yahoo_stealthed.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_stealthed.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_stealthed.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
uninstall-kde-icons:
@@ -69303,9 +73215,12 @@
+ -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/32x32/actions/yahoo_stealthed.png
++ -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_stealthed.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/22x22/actions/yahoo_stealthed.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
@@ -69315,21 +73230,24 @@
- -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/22x22/actions/yahoo_stealthed.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/yahoo_stealthed.png
+- -rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_stealthed.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
-@@ -131,6 +131,7 @@
+--- kopete/protocols/yahoo/libkyahoo/Makefile.in
++++ kopete/protocols/yahoo/libkyahoo/Makefile.in
+@@ -185,6 +185,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -280,6 +281,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69339,7 +73257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -270,6 +274,7 @@
+@@ -327,6 +331,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -69347,7 +73265,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -281,12 +286,9 @@
+@@ -338,12 +343,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -69360,9 +73278,9 @@
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@
+@@ -364,10 +366,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -69374,7 +73292,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -317,6 +322,7 @@
+@@ -376,6 +381,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -69382,7 +73300,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -393,12 +399,15 @@
+@@ -456,12 +462,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -69398,16 +73316,16 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -433,7 +442,7 @@
+@@ -510,7 +519,7 @@
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +480,9 @@
+@@ -548,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69419,463 +73337,144 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kopete/protocols/yahoo/Makefile.in
-+++ kopete/protocols/yahoo/Makefile.in
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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 @@
+@@ -1023,11 +1032,11 @@
+ mocs: yahooclientstream.moc
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -529,9 +538,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+-yahoobytestream.moc: $(srcdir)/yahoobytestream.h
+- $(MOC) $(srcdir)/yahoobytestream.h -o yahoobytestream.moc
++receivefiletask.moc: $(srcdir)/receivefiletask.h
++ $(MOC) $(srcdir)/receivefiletask.h -o receivefiletask.moc
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -964,13 +973,6 @@
- mocs: yahoouserinfo.moc
+ #>+ 2
+-mocs: yahoobytestream.moc
++mocs: receivefiletask.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
+ requestpicturetask.moc: $(srcdir)/requestpicturetask.h
+@@ -1037,11 +1046,11 @@
+ mocs: requestpicturetask.moc
-@@ -985,6 +987,13 @@
- mocs: kyahoo.moc
+ #>+ 3
+-receivefiletask.moc: $(srcdir)/receivefiletask.h
+- $(MOC) $(srcdir)/receivefiletask.h -o receivefiletask.moc
++yahoobytestream.moc: $(srcdir)/yahoobytestream.h
++ $(MOC) $(srcdir)/yahoobytestream.h -o yahoobytestream.moc
+ #>+ 2
+-mocs: receivefiletask.moc
++mocs: yahoobytestream.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
+ conferencetask.moc: $(srcdir)/conferencetask.h
+@@ -1065,18 +1074,18 @@
+ mocs: sendauthresptask.moc
-@@ -1021,7 +1030,7 @@
+ #>+ 3
+-task.moc: $(srcdir)/task.h
+- $(MOC) $(srcdir)/task.h -o task.moc
++picturenotifiertask.moc: $(srcdir)/picturenotifiertask.h
++ $(MOC) $(srcdir)/picturenotifiertask.h -o picturenotifiertask.moc
+ #>+ 2
+-mocs: task.moc
++mocs: picturenotifiertask.moc
+
#>+ 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
+-picturenotifiertask.moc: $(srcdir)/picturenotifiertask.h
+- $(MOC) $(srcdir)/picturenotifiertask.h -o picturenotifiertask.moc
++task.moc: $(srcdir)/task.h
++ $(MOC) $(srcdir)/task.h -o task.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 +1081,7 @@
+-mocs: picturenotifiertask.moc
++mocs: task.moc
+ #>+ 3
+ client.moc: $(srcdir)/client.h
+@@ -1135,18 +1144,18 @@
+ mocs: mailnotifiertask.moc
- #>+ 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
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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 @@
+ #>+ 3
+-inputprotocolbase.moc: $(srcdir)/inputprotocolbase.h
+- $(MOC) $(srcdir)/inputprotocolbase.h -o inputprotocolbase.moc
++yahooconnector.moc: $(srcdir)/yahooconnector.h
++ $(MOC) $(srcdir)/yahooconnector.h -o yahooconnector.moc
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -481,9 +490,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 2
+-mocs: inputprotocolbase.moc
++mocs: yahooconnector.moc
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+-yahooconnector.moc: $(srcdir)/yahooconnector.h
+- $(MOC) $(srcdir)/yahooconnector.h -o yahooconnector.moc
++modifyyabtask.moc: $(srcdir)/modifyyabtask.h
++ $(MOC) $(srcdir)/modifyyabtask.h -o modifyyabtask.moc
- clean-noinstLTLIBRARIES:
---- kopete/sounds/Makefile.in
-+++ kopete/sounds/Makefile.in
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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
+ #>+ 2
+-mocs: yahooconnector.moc
++mocs: modifyyabtask.moc
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -442,9 +451,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+ messagereceivertask.moc: $(srcdir)/messagereceivertask.h
+@@ -1156,11 +1165,11 @@
+ mocs: messagereceivertask.moc
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+-modifyyabtask.moc: $(srcdir)/modifyyabtask.h
+- $(MOC) $(srcdir)/modifyyabtask.h -o modifyyabtask.moc
++inputprotocolbase.moc: $(srcdir)/inputprotocolbase.h
++ $(MOC) $(srcdir)/inputprotocolbase.h -o inputprotocolbase.moc
- mostlyclean-libtool:
---- kopete/styles/data/Adium/Makefile.in
-+++ kopete/styles/data/Adium/Makefile.in
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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
+ #>+ 2
+-mocs: modifyyabtask.moc
++mocs: inputprotocolbase.moc
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -443,9 +452,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+ sendnotifytask.moc: $(srcdir)/sendnotifytask.h
+@@ -1171,10 +1180,10 @@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+ clean-metasources:
+- -rm -f yabtask.moc listtask.moc yahoobuddyiconloader.moc bytestream.moc logintask.moc filetransfernotifiertask.moc connector.moc sendpicturetask.moc yahooclientstream.moc yahoobytestream.moc requestpicturetask.moc receivefiletask.moc conferencetask.moc stream.moc sendauthresptask.moc task.moc picturenotifiertask.moc client.moc coreprotocol.moc sendfiletask.moc ymsgprotocol.moc statusnotifiertask.moc safedelete.moc webcamtask.moc mailnotifiertask.moc inputprotocolbase.moc yahooconnector.moc messagereceivertask.moc modifyyabtask.moc sendnotifytask.moc
++ -rm -f yabtask.moc listtask.moc yahoobuddyiconloader.moc bytestream.moc logintask.moc filetransfernotifiertask.moc connector.moc sendpicturetask.moc yahooclientstream.moc receivefiletask.moc requestpicturetask.moc yahoobytestream.moc conferencetask.moc stream.moc sendauthresptask.moc picturenotifiertask.moc task.moc client.moc coreprotocol.moc sendfiletask.moc ymsgprotocol.moc statusnotifiertask.moc safedelete.moc webcamtask.moc mailnotifiertask.moc yahooconnector.moc modifyyabtask.moc messagereceivertask.moc inputprotocolbase.moc sendnotifytask.moc
- mostlyclean-libtool:
---- kopete/styles/data/iChat/blue/From/Makefile.in
-+++ kopete/styles/data/iChat/blue/From/Makefile.in
-@@ -110,6 +110,7 @@
+ #>+ 2
+-KDE_DIST=yahoobuddyiconloader.h changestatustask.h coreprotocol.h yahoo_fn.h listtask.h ymsgprotocol.h picturenotifiertask.h safedelete.h sendmessagetask.h receivefiletask.h oscartypes.h sendnotifytask.h bytestream.h ymsgtransfer.h client.h logofftask.h transfer.h yahoobytestream.h sha1.h Makefile.in statusnotifiertask.h md5.h connector.h conferencetask.h yahootypes.h libyahoo.h pingtask.h stealthtask.h sendfiletask.h webcamtask.h stream.h task.h yahooclientstream.h sendpicturetask.h yahooconnector.h configure.in.in mailnotifiertask.h requestpicturetask.h sendauthresptask.h modifybuddytask.h messagereceivertask.h filetransfernotifiertask.h inputprotocolbase.h Makefile.am
++KDE_DIST=yahoobuddyiconloader.h changestatustask.h coreprotocol.h yahoo_fn.h listtask.h ymsgprotocol.h picturenotifiertask.h safedelete.h sendmessagetask.h receivefiletask.h sendnotifytask.h bytestream.h oscartypes.h ymsgtransfer.h client.h logofftask.h transfer.h yahoobytestream.h sha1.h Makefile.in statusnotifiertask.h md5.h connector.h conferencetask.h yahootypes.h libyahoo.h pingtask.h stealthtask.h sendfiletask.h webcamtask.h stream.h task.h yahooclientstream.h sendpicturetask.h yahooconnector.h configure.in.in mailnotifiertask.h requestpicturetask.h sendauthresptask.h modifybuddytask.h messagereceivertask.h filetransfernotifiertask.h inputprotocolbase.h Makefile.am
+
+ #>+ 3
+ clean-closures:
+@@ -1265,16 +1274,16 @@
+ logintask.lo: logintask.moc
+ conferencetask.lo: conferencetask.moc
+ yahooclientstream.o: yahooclientstream.moc
+-yahooconnector.o: yahooconnector.moc
+ inputprotocolbase.o: inputprotocolbase.moc
++yahooconnector.o: yahooconnector.moc
+ webcamtask.o: webcamtask.moc
+ webcamtask.lo: webcamtask.moc
+ receivefiletask.o: receivefiletask.moc
+ statusnotifiertask.o: statusnotifiertask.moc
+ modifyyabtask.lo: modifyyabtask.moc
+ listtask.lo: listtask.moc
+-stream.lo: stream.moc
+ task.lo: task.moc
++stream.lo: stream.moc
+ yabtask.lo: yabtask.moc
+ yahooclientstream.lo: yahooclientstream.moc
+ yahoobuddyiconloader.o: yahoobuddyiconloader.moc
+--- kopete/protocols/yahoo/libkyahoo/tests/Makefile.in
++++ kopete/protocols/yahoo/libkyahoo/tests/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -229,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69885,7 +73484,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -276,6 +280,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -69893,7 +73492,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -287,12 +292,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -69906,9 +73505,9 @@
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@
+@@ -313,10 +315,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -69920,7 +73519,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -325,6 +330,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -69928,7 +73527,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -405,12 +411,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -69944,16 +73543,16 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -440,7 +449,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -478,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -69964,18 +73563,18 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- kopete/styles/data/iChat/blue/Makefile.in
-+++ kopete/styles/data/iChat/blue/Makefile.in
-@@ -126,6 +126,7 @@
+ clean-checkPROGRAMS:
+--- kopete/protocols/yahoo/Makefile.in
++++ kopete/protocols/yahoo/Makefile.in
+@@ -172,6 +172,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -267,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -69985,7 +73584,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -314,6 +318,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -69993,7 +73592,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -325,12 +330,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -70006,9 +73605,9 @@
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@
+@@ -351,10 +353,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -70020,7 +73619,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -363,6 +368,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -70028,7 +73627,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -443,12 +449,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -70044,16 +73643,16 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
- all: docs-am all-recursive
+@@ -495,7 +504,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -533,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70063,319 +73662,62 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -988,18 +997,18 @@
+ mocs: yahooprotocol.moc
- mostlyclean-libtool:
---- kopete/styles/data/iChat/blue/To/Makefile.in
-+++ kopete/styles/data/iChat/blue/To/Makefile.in
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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
+ #>+ 3
+-yahooaccount.moc: $(srcdir)/yahooaccount.h
+- $(MOC) $(srcdir)/yahooaccount.h -o yahooaccount.moc
++yahooverifyaccount.moc: $(srcdir)/yahooverifyaccount.h
++ $(MOC) $(srcdir)/yahooverifyaccount.h -o yahooverifyaccount.moc
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -443,9 +452,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 2
+-mocs: yahooaccount.moc
++mocs: yahooverifyaccount.moc
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+-yahooverifyaccount.moc: $(srcdir)/yahooverifyaccount.h
+- $(MOC) $(srcdir)/yahooverifyaccount.h -o yahooverifyaccount.moc
++yahooaccount.moc: $(srcdir)/yahooaccount.h
++ $(MOC) $(srcdir)/yahooaccount.h -o yahooaccount.moc
- mostlyclean-libtool:
---- kopete/styles/data/iChat/clear/From/Makefile.in
-+++ kopete/styles/data/iChat/clear/From/Makefile.in
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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
+ #>+ 2
+-mocs: yahooverifyaccount.moc
++mocs: yahooaccount.moc
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -443,9 +452,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+ yahooaddcontact.moc: $(srcdir)/yahooaddcontact.h
+@@ -1017,7 +1026,7 @@
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
+ clean-metasources:
+- -rm -f yahoowebcam.moc yahooconferencemessagemanager.moc yahoocontact.moc yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooverifyaccount.moc yahooaddcontact.moc yahoochatsession.moc
++ -rm -f yahoowebcam.moc yahooconferencemessagemanager.moc yahoocontact.moc yahooeditaccount.moc yahooprotocol.moc yahooverifyaccount.moc yahooaccount.moc yahooaddcontact.moc yahoochatsession.moc
- mostlyclean-libtool:
---- kopete/styles/data/iChat/clear/Makefile.in
-+++ kopete/styles/data/iChat/clear/Makefile.in
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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
+ #>+ 2
+ KDE_DIST=yahoowebcam.h yahoochatui.rc yahooprotocol.h yahoocontact.h yahooeditaccount.h Makefile.in yahoochatsession.h yahooconferenceui.rc yahooconferencemessagemanager.h yahooaccount.h yahooverifyaccount.h yahooaddcontact.h kopete_yahoo.desktop Makefile.am
+@@ -1068,7 +1077,7 @@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -460,9 +469,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- kopete/styles/data/iChat/clear/To/Makefile.in
-+++ kopete/styles/data/iChat/clear/To/Makefile.in
-@@ -110,6 +110,7 @@
+ #>+ 11
+-kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp $(srcdir)/yahoochatsession.cpp $(srcdir)/yahooverifyaccount.cpp $(srcdir)/yahoowebcam.cpp yahooeditaccount.moc yahooprotocol.moc yahoowebcam.moc yahooverifyaccount.moc yahooaccount.moc yahooconferencemessagemanager.moc yahooaddcontact.moc yahoochatsession.moc yahoocontact.moc
++kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp $(srcdir)/yahoochatsession.cpp $(srcdir)/yahooverifyaccount.cpp $(srcdir)/yahoowebcam.cpp yahooeditaccount.moc yahooprotocol.moc yahoowebcam.moc yahooaccount.moc yahooverifyaccount.moc yahooconferencemessagemanager.moc yahooaddcontact.moc yahoochatsession.moc yahoocontact.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
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -236,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70385,7 +73727,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -283,6 +287,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70393,7 +73735,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -294,12 +299,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -70406,9 +73748,9 @@
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@
+@@ -320,10 +322,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -70420,7 +73762,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -332,6 +337,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -70428,7 +73770,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -412,12 +418,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -70444,16 +73786,16 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -461,7 +470,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -499,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70464,18 +73806,18 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- kopete/styles/data/iChat/graphite/From/Makefile.in
-+++ kopete/styles/data/iChat/graphite/From/Makefile.in
-@@ -110,6 +110,7 @@
+ clean-noinstLTLIBRARIES:
+--- kopete/sounds/Makefile.in
++++ kopete/sounds/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70485,7 +73827,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70493,7 +73835,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -70506,9 +73848,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -70520,7 +73862,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -70528,7 +73870,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -70544,7 +73886,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -416,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -70553,7 +73895,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -454,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70565,17 +73907,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/graphite/Makefile.in
-+++ kopete/styles/data/iChat/graphite/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Clean/Contents/Makefile.in
++++ kopete/styles/Clean/Contents/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70585,7 +73927,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70593,7 +73935,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -70606,9 +73948,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -70620,7 +73962,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -70628,7 +73970,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -70644,7 +73986,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -70653,7 +73995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70665,17 +74007,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/graphite/To/Makefile.in
-+++ kopete/styles/data/iChat/graphite/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Clean/Contents/Resources/images/Makefile.in
++++ kopete/styles/Clean/Contents/Resources/images/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70685,7 +74027,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70693,7 +74035,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -70706,9 +74048,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -70720,7 +74062,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -70728,7 +74070,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -70744,7 +74086,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -70753,7 +74095,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70765,17 +74107,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/green/From/Makefile.in
-+++ kopete/styles/data/iChat/green/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Clean/Contents/Resources/Incoming/Makefile.in
++++ kopete/styles/Clean/Contents/Resources/Incoming/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70785,7 +74127,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70793,7 +74135,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -70806,9 +74148,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -70820,7 +74162,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -70828,7 +74170,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -70844,7 +74186,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -70853,7 +74195,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70865,17 +74207,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/green/Makefile.in
-+++ kopete/styles/data/iChat/green/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Clean/Contents/Resources/Makefile.in
++++ kopete/styles/Clean/Contents/Resources/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70885,7 +74227,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70893,7 +74235,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -70906,9 +74248,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -70920,7 +74262,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -70928,7 +74270,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -70944,7 +74286,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -434,7 +443,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -70953,7 +74295,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -70965,17 +74307,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/green/To/Makefile.in
-+++ kopete/styles/data/iChat/green/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Clean/Contents/Resources/Outgoing/Makefile.in
++++ kopete/styles/Clean/Contents/Resources/Outgoing/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -70985,7 +74327,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -70993,7 +74335,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71006,9 +74348,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71020,7 +74362,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71028,7 +74370,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71044,7 +74386,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -71053,7 +74395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71065,17 +74407,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/Makefile.in
-+++ kopete/styles/data/iChat/Makefile.in
-@@ -116,6 +116,7 @@
+--- kopete/styles/Clean/Makefile.in
++++ kopete/styles/Clean/Makefile.in
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71085,7 +74427,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71093,7 +74435,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71106,9 +74448,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71120,7 +74462,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71128,7 +74470,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71144,7 +74486,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -71153,7 +74495,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71165,17 +74507,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/orange/From/Makefile.in
-+++ kopete/styles/data/iChat/orange/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Clear/Contents/Makefile.in
++++ kopete/styles/Clear/Contents/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71185,7 +74527,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71193,7 +74535,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71206,9 +74548,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71220,7 +74562,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71228,7 +74570,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71244,8 +74586,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -71253,7 +74595,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71265,17 +74607,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/orange/Makefile.in
-+++ kopete/styles/data/iChat/orange/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Clear/Contents/Resources/images/Makefile.in
++++ kopete/styles/Clear/Contents/Resources/images/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71285,7 +74627,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71293,7 +74635,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71306,9 +74648,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71320,7 +74662,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71328,7 +74670,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71344,8 +74686,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
- all: docs-am all-recursive
+@@ -417,7 +426,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -71353,7 +74695,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71365,117 +74707,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/orange/To/Makefile.in
-+++ kopete/styles/data/iChat/orange/To/Makefile.in
-@@ -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@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -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
+@@ -616,7 +625,7 @@
+ .NOEXPORT:
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -443,9 +452,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 2
+-KDE_DIST=footer-inbound-left.png icon-internal.png footer-outbound-right.png body-inbound-arrow.png header-outbound-background.png header-inbound-background.png body-outbound-right.png footer-outbound-left.png body-inbound-avatar.png body-outbound-arrow.png body-outbound-avatar.png header-outbound-right.png Makefile.in icon-action.png header-inbound-left.png body-outbound-left.png footer-inbound-right.png icon-time.png footer-outbound-background.png icon-you.png header-inbound-right.png footer-inbound-background.png icon-highlighted.png body-inbound-left.png header-outbound-left.png body-inbound-background.png body-background.png icon-me.png body-inbound-right.png Makefile.am
++KDE_DIST=footer-inbound-left.png icon-internal.png footer-outbound-right.png body-inbound-arrow.png header-outbound-background.png header-inbound-background.png body-outbound-right.png footer-outbound-left.png body-inbound-avatar.png body-outbound-arrow.png body-outbound-avatar.png header-outbound-right.png Makefile.in icon-action.png header-inbound-left.png footer-inbound-right.png body-outbound-left.png icon-time.png icon-you.png footer-outbound-background.png header-inbound-right.png footer-inbound-background.png icon-highlighted.png header-outbound-left.png body-inbound-background.png body-inbound-left.png body-background.png icon-me.png body-inbound-right.png Makefile.am
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- kopete/styles/data/iChat/pink/From/Makefile.in
-+++ kopete/styles/data/iChat/pink/From/Makefile.in
-@@ -110,6 +110,7 @@
+ #>+ 2
+ docs-am:
+--- kopete/styles/Clear/Contents/Resources/Incoming/Makefile.in
++++ kopete/styles/Clear/Contents/Resources/Incoming/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71485,7 +74736,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71493,7 +74744,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71506,9 +74757,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71520,7 +74771,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71528,7 +74779,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71544,7 +74795,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -71553,7 +74804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71565,17 +74816,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/pink/Makefile.in
-+++ kopete/styles/data/iChat/pink/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Clear/Contents/Resources/Makefile.in
++++ kopete/styles/Clear/Contents/Resources/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71585,7 +74836,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71593,7 +74844,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71606,9 +74857,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71620,7 +74871,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71628,7 +74879,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71644,7 +74895,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -434,7 +443,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -71653,7 +74904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71665,17 +74916,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/pink/To/Makefile.in
-+++ kopete/styles/data/iChat/pink/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Clear/Contents/Resources/Outgoing/Makefile.in
++++ kopete/styles/Clear/Contents/Resources/Outgoing/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71685,7 +74936,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71693,7 +74944,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71706,9 +74957,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71720,7 +74971,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71728,7 +74979,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71744,7 +74995,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -71753,7 +75004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71765,17 +75016,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/purple/From/Makefile.in
-+++ kopete/styles/data/iChat/purple/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Clear/Makefile.in
++++ kopete/styles/Clear/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71785,7 +75036,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71793,7 +75044,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71806,9 +75057,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71820,7 +75071,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71828,7 +75079,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71844,8 +75095,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -71853,7 +75104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71865,17 +75116,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/purple/Makefile.in
-+++ kopete/styles/data/iChat/purple/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Gaim/Contents/Makefile.in
++++ kopete/styles/Gaim/Contents/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71885,7 +75136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71893,7 +75144,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -71906,9 +75157,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -71920,7 +75171,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -71928,7 +75179,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -71944,7 +75195,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -71953,7 +75204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -71965,17 +75216,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/purple/To/Makefile.in
-+++ kopete/styles/data/iChat/purple/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.in
++++ kopete/styles/Gaim/Contents/Resources/Incoming/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -71985,7 +75236,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -71993,7 +75244,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72006,9 +75257,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72020,7 +75271,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72028,7 +75279,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72044,7 +75295,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -72053,7 +75304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72065,17 +75316,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/yellow/From/Makefile.in
-+++ kopete/styles/data/iChat/yellow/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Gaim/Contents/Resources/Makefile.in
++++ kopete/styles/Gaim/Contents/Resources/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72085,7 +75336,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72093,7 +75344,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72106,9 +75357,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72120,7 +75371,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72128,7 +75379,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72144,8 +75395,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -434,7 +443,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -72153,7 +75404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72165,17 +75416,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/yellow/Makefile.in
-+++ kopete/styles/data/iChat/yellow/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.in
++++ kopete/styles/Gaim/Contents/Resources/Outgoing/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72185,7 +75436,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72193,7 +75444,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72206,9 +75457,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72220,7 +75471,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72228,7 +75479,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72244,8 +75495,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
- all: docs-am all-recursive
+@@ -417,7 +426,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -72253,7 +75504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72265,17 +75516,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat/yellow/To/Makefile.in
-+++ kopete/styles/data/iChat/yellow/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Gaim/Contents/Resources/Variants/Makefile.in
++++ kopete/styles/Gaim/Contents/Resources/Variants/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72285,7 +75536,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72293,7 +75544,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72306,9 +75557,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72320,7 +75571,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72328,7 +75579,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72344,7 +75595,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -72353,7 +75604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72365,17 +75616,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/blue/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/blue/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Gaim/Makefile.in
++++ kopete/styles/Gaim/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72385,7 +75636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72393,7 +75644,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72406,9 +75657,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72420,7 +75671,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72428,7 +75679,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72444,8 +75695,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -72453,7 +75704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72465,17 +75716,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/blue/Makefile.in
-+++ kopete/styles/data/iChat-Trans/blue/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Hacker/Contents/Makefile.in
++++ kopete/styles/Hacker/Contents/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72485,7 +75736,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72493,7 +75744,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72506,9 +75757,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72520,7 +75771,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72528,7 +75779,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72544,7 +75795,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -434,7 +443,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -72553,7 +75804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72565,17 +75816,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/blue/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/blue/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Hacker/Contents/Resources/images/Makefile.in
++++ kopete/styles/Hacker/Contents/Resources/images/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72585,7 +75836,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72593,7 +75844,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72606,9 +75857,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72620,7 +75871,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72628,7 +75879,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72644,7 +75895,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -72653,7 +75904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72665,17 +75916,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/clear/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/clear/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Hacker/Contents/Resources/Incoming/Makefile.in
++++ kopete/styles/Hacker/Contents/Resources/Incoming/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72685,7 +75936,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72693,7 +75944,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72706,9 +75957,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72720,7 +75971,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72728,7 +75979,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72744,7 +75995,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -72753,7 +76004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72765,17 +76016,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/clear/Makefile.in
-+++ kopete/styles/data/iChat-Trans/clear/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Hacker/Contents/Resources/Makefile.in
++++ kopete/styles/Hacker/Contents/Resources/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72785,7 +76036,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72793,7 +76044,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72806,9 +76057,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72820,7 +76071,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72828,7 +76079,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72844,7 +76095,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -434,7 +443,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -72853,7 +76104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72865,17 +76116,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/clear/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/clear/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Hacker/Contents/Resources/Outgoing/Makefile.in
++++ kopete/styles/Hacker/Contents/Resources/Outgoing/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72885,7 +76136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72893,7 +76144,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -72906,9 +76157,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -72920,7 +76171,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -72928,7 +76179,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -72944,7 +76195,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -72953,7 +76204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -72965,17 +76216,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Hacker/Contents/Resources/Variants/Makefile.in
++++ kopete/styles/Hacker/Contents/Resources/Variants/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -72985,7 +76236,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -72993,7 +76244,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73006,9 +76257,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73020,7 +76271,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73028,7 +76279,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73044,7 +76295,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -73053,7 +76304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73065,17 +76316,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/graphite/Makefile.in
-+++ kopete/styles/data/iChat-Trans/graphite/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Hacker/Makefile.in
++++ kopete/styles/Hacker/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73085,7 +76336,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73093,7 +76344,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73106,9 +76357,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73120,7 +76371,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73128,7 +76379,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73144,7 +76395,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -434,7 +443,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -73153,7 +76404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73165,17 +76416,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Konqi/Contents/Makefile.in
++++ kopete/styles/Konqi/Contents/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73185,7 +76436,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73193,7 +76444,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73206,9 +76457,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73220,7 +76471,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73228,7 +76479,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73244,8 +76495,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -73253,7 +76504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73265,17 +76516,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/green/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/green/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Konqi/Contents/Resources/Incoming/Makefile.in
++++ kopete/styles/Konqi/Contents/Resources/Incoming/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73285,7 +76536,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73293,7 +76544,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73306,9 +76557,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73320,7 +76571,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73328,7 +76579,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73344,7 +76595,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -73353,7 +76604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73365,17 +76616,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/green/Makefile.in
-+++ kopete/styles/data/iChat-Trans/green/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Konqi/Contents/Resources/Makefile.in
++++ kopete/styles/Konqi/Contents/Resources/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73385,7 +76636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73393,7 +76644,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73406,9 +76657,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73420,7 +76671,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73428,7 +76679,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73444,7 +76695,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -434,7 +443,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -73453,7 +76704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73465,17 +76716,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/green/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/green/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Konqi/Contents/Resources/Outgoing/Makefile.in
++++ kopete/styles/Konqi/Contents/Resources/Outgoing/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73485,7 +76736,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73493,7 +76744,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73506,9 +76757,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73520,7 +76771,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73528,7 +76779,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73544,7 +76795,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -73553,7 +76804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73565,17 +76816,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/Makefile.in
-+++ kopete/styles/data/iChat-Trans/Makefile.in
-@@ -116,6 +116,7 @@
+--- kopete/styles/Konqi/Contents/Resources/Variants/konqui/Makefile.in
++++ kopete/styles/Konqi/Contents/Resources/Variants/konqui/Makefile.in
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73606,9 +76857,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73620,7 +76871,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73628,7 +76879,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73644,8 +76895,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
- all: docs-am all-recursive
+@@ -417,7 +426,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -73653,7 +76904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73665,17 +76916,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/orange/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/orange/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Konqi/Contents/Resources/Variants/Makefile.in
++++ kopete/styles/Konqi/Contents/Resources/Variants/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73685,7 +76936,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73693,7 +76944,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73706,9 +76957,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73720,7 +76971,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73728,7 +76979,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73744,8 +76995,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -434,7 +443,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -73753,7 +77004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73765,17 +77016,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/orange/Makefile.in
-+++ kopete/styles/data/iChat-Trans/orange/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Konqi/Makefile.in
++++ kopete/styles/Konqi/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73785,7 +77036,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73793,7 +77044,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73806,9 +77057,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73820,7 +77071,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73828,7 +77079,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73844,7 +77095,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -73853,7 +77104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73865,17 +77116,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/orange/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/orange/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Kopete/Contents/Makefile.in
++++ kopete/styles/Kopete/Contents/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73885,7 +77136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73893,7 +77144,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -73906,9 +77157,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -73920,7 +77171,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -73928,7 +77179,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -73944,8 +77195,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -73953,7 +77204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73965,17 +77216,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/pink/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/pink/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Kopete/Contents/Resources/images/Makefile.in
++++ kopete/styles/Kopete/Contents/Resources/images/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -73985,7 +77236,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -73993,7 +77244,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74006,9 +77257,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74020,7 +77271,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74028,7 +77279,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74044,7 +77295,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -74053,7 +77304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74065,17 +77316,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/pink/Makefile.in
-+++ kopete/styles/data/iChat-Trans/pink/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Kopete/Contents/Resources/Incoming/Makefile.in
++++ kopete/styles/Kopete/Contents/Resources/Incoming/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74085,7 +77336,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74093,7 +77344,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74106,9 +77357,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74120,7 +77371,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74128,7 +77379,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74144,8 +77395,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
- all: docs-am all-recursive
+@@ -417,7 +426,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -74153,7 +77404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74165,17 +77416,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/pink/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/pink/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Kopete/Contents/Resources/Makefile.in
++++ kopete/styles/Kopete/Contents/Resources/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74185,7 +77436,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74193,7 +77444,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74206,9 +77457,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74220,7 +77471,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74228,7 +77479,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74244,8 +77495,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -434,7 +443,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -74253,7 +77504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74265,17 +77516,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/purple/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/purple/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile.in
++++ kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74285,7 +77536,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74293,7 +77544,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74306,9 +77557,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74320,7 +77571,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74328,7 +77579,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74344,7 +77595,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -74353,7 +77604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74365,17 +77616,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/purple/Makefile.in
-+++ kopete/styles/data/iChat-Trans/purple/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Kopete/Contents/Resources/Variants/Makefile.in
++++ kopete/styles/Kopete/Contents/Resources/Variants/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74385,7 +77636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74393,7 +77644,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74406,9 +77657,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74420,7 +77671,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74428,7 +77679,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74444,8 +77695,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
- all: docs-am all-recursive
+@@ -417,7 +426,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -74453,7 +77704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74465,17 +77716,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/purple/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/purple/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Kopete/Makefile.in
++++ kopete/styles/Kopete/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74485,7 +77736,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74493,7 +77744,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74506,9 +77757,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74520,7 +77771,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74528,7 +77779,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74544,8 +77795,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -74553,7 +77804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74565,17 +77816,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
-+++ kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Makefile.in
++++ kopete/styles/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74585,7 +77836,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74593,7 +77844,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74606,9 +77857,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74620,7 +77871,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74628,7 +77879,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74644,8 +77895,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -421,7 +430,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -74653,7 +77904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74665,17 +77916,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/yellow/Makefile.in
-+++ kopete/styles/data/iChat-Trans/yellow/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Retropete/Contents/Makefile.in
++++ kopete/styles/Retropete/Contents/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74685,7 +77936,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74693,7 +77944,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74706,9 +77957,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74720,7 +77971,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74728,7 +77979,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74744,7 +77995,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -422,7 +431,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -74753,7 +78004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +469,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74765,17 +78016,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
-+++ kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Retropete/Contents/Resources/Incoming/Makefile.in
++++ kopete/styles/Retropete/Contents/Resources/Incoming/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74785,7 +78036,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74793,7 +78044,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74806,9 +78057,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74820,7 +78071,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74828,7 +78079,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74844,7 +78095,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -74853,7 +78104,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74865,17 +78116,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/Kopete/Makefile.in
-+++ kopete/styles/data/Kopete/Makefile.in
-@@ -110,6 +110,7 @@
+--- kopete/styles/Retropete/Contents/Resources/Makefile.in
++++ kopete/styles/Retropete/Contents/Resources/Makefile.in
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -74885,7 +78136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -74893,7 +78144,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -74906,9 +78157,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -74920,7 +78171,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -74928,7 +78179,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -74944,8 +78195,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
- all: docs-am all-am
+@@ -434,7 +443,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -74953,7 +78204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -472,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74965,17 +78216,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/data/Makefile.in
-+++ kopete/styles/data/Makefile.in
-@@ -116,6 +116,7 @@
+--- kopete/styles/Retropete/Contents/Resources/Outgoing/Makefile.in
++++ kopete/styles/Retropete/Contents/Resources/Outgoing/Makefile.in
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75006,9 +78257,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75020,7 +78271,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75028,7 +78279,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75044,8 +78295,8 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
- all: docs-am all-recursive
+@@ -417,7 +426,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -75053,7 +78304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75065,17 +78316,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kopete/styles/Makefile.in
-+++ kopete/styles/Makefile.in
-@@ -126,6 +126,7 @@
+--- kopete/styles/Retropete/Makefile.in
++++ kopete/styles/Retropete/Makefile.in
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75085,7 +78336,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75093,7 +78344,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -75106,9 +78357,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75120,7 +78371,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75128,7 +78379,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75144,7 +78395,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -434,7 +443,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -75153,7 +78404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +481,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75167,15 +78418,15 @@
mostlyclean-libtool:
--- kpf/Makefile.in
+++ kpf/Makefile.in
-@@ -128,6 +128,7 @@
+@@ -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@
-@@ -224,6 +225,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -226,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75185,7 +78436,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -267,6 +271,7 @@
+@@ -273,6 +277,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75193,7 +78444,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -278,12 +283,9 @@
+@@ -284,12 +289,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -75206,9 +78457,9 @@
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@
+@@ -310,10 +312,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75220,7 +78471,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -314,6 +319,7 @@
+@@ -322,6 +327,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75228,7 +78479,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -390,12 +396,15 @@
+@@ -402,12 +408,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75244,7 +78495,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -427,7 +436,7 @@
+@@ -439,7 +448,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -75253,7 +78504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +474,9 @@
+@@ -477,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75265,7 +78516,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -805,17 +814,17 @@
+@@ -817,17 +826,17 @@
#>+ 13
install-kde-icons:
@@ -75291,15 +78542,15 @@
force-reedit:
--- kpf/src/Makefile.in
+++ kpf/src/Makefile.in
-@@ -173,6 +173,7 @@
+@@ -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@
-@@ -269,6 +270,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -271,6 +272,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75309,7 +78560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -312,6 +316,7 @@
+@@ -318,6 +322,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75317,7 +78568,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -323,12 +328,9 @@
+@@ -329,12 +334,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -75330,9 +78581,9 @@
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@
+@@ -355,10 +357,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75344,7 +78595,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -359,6 +364,7 @@
+@@ -367,6 +372,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75352,7 +78603,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -435,12 +441,15 @@
+@@ -447,12 +453,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75368,7 +78619,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -598,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -75377,7 +78628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -636,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75389,7 +78640,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -942,13 +951,6 @@
+@@ -954,13 +963,6 @@
#>+ 3
@@ -75403,7 +78654,7 @@
Server.moc: $(srcdir)/Server.h
$(MOC) $(srcdir)/Server.h -o Server.moc
-@@ -977,81 +979,88 @@
+@@ -989,81 +991,88 @@
mocs: Applet.moc
#>+ 3
@@ -75525,7 +78776,7 @@
#>+ 3
WebServerManager_stub.h: WebServerManager.kidl
-@@ -1068,7 +1077,7 @@
+@@ -1080,7 +1089,7 @@
#>+ 3
clean-metasources:
@@ -75534,7 +78785,7 @@
#>+ 2
KDE_DIST=KPFInterface.h System.h Makefile.in Defines.h KPFInterface.cpp Makefile.am
-@@ -1128,7 +1137,7 @@
+@@ -1140,7 +1149,7 @@
#>+ 11
@@ -75543,7 +78794,7 @@
@echo 'creating kpf_panelapplet_la.all_cpp.cpp ...'; \
rm -f kpf_panelapplet_la.all_cpp.files kpf_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpf_panelapplet_la.all_cpp.final; \
-@@ -1140,7 +1149,7 @@
+@@ -1152,7 +1161,7 @@
rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
#>+ 11
@@ -75552,7 +78803,7 @@
@echo 'creating kpfpropertiesdialog_la.all_cpp.cpp ...'; \
rm -f kpfpropertiesdialog_la.all_cpp.files kpfpropertiesdialog_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpfpropertiesdialog_la.all_cpp.final; \
-@@ -1184,8 +1193,8 @@
+@@ -1196,8 +1205,8 @@
$(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h
ActiveMonitor.o: ActiveMonitor.moc
SingleServerConfigDialog.lo: SingleServerConfigDialog.moc
@@ -75564,15 +78815,15 @@
$(srcdir)/PortValidator.cpp: WebServer_stub.h
--- kppp/DB/Makefile.in
+++ kppp/DB/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75582,7 +78833,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75590,7 +78841,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -75603,9 +78854,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75617,7 +78868,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75625,7 +78876,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75641,7 +78892,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -75650,7 +78901,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75664,15 +78915,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Austria/Makefile.in
+++ kppp/DB/Provider/Austria/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75682,7 +78933,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75690,7 +78941,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -75703,9 +78954,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75717,7 +78968,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75725,7 +78976,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75741,7 +78992,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -75750,7 +79001,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75764,15 +79015,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Belarus/Makefile.in
+++ kppp/DB/Provider/Belarus/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75782,7 +79033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75790,7 +79041,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -75803,9 +79054,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75817,7 +79068,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75825,7 +79076,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75841,7 +79092,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -75850,7 +79101,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75864,15 +79115,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Czech_Republic/Makefile.in
+++ kppp/DB/Provider/Czech_Republic/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75882,7 +79133,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75890,7 +79141,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -75903,9 +79154,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -75917,7 +79168,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -75925,7 +79176,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -75941,7 +79192,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -419,7 +428,7 @@
+@@ -431,7 +440,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -75950,7 +79201,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +466,9 @@
+@@ -469,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -75962,7 +79213,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -618,7 +627,7 @@
+@@ -630,7 +639,7 @@
.NOEXPORT:
#>+ 2
@@ -75973,15 +79224,15 @@
docs-am:
--- kppp/DB/Provider/Denmark/Makefile.in
+++ kppp/DB/Provider/Denmark/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -75991,7 +79242,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -75999,7 +79250,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76012,9 +79263,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76026,7 +79277,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76034,7 +79285,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76050,7 +79301,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76059,7 +79310,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76073,15 +79324,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/France/Makefile.in
+++ kppp/DB/Provider/France/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76091,7 +79342,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76099,7 +79350,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76112,9 +79363,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76126,7 +79377,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76134,7 +79385,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76150,7 +79401,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76159,7 +79410,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76173,15 +79424,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Germany/Makefile.in
+++ kppp/DB/Provider/Germany/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76191,7 +79442,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76199,7 +79450,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76212,9 +79463,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76226,7 +79477,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76234,7 +79485,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76250,7 +79501,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76259,7 +79510,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76273,15 +79524,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Ireland/Makefile.in
+++ kppp/DB/Provider/Ireland/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76291,7 +79542,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76299,7 +79550,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76312,9 +79563,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76326,7 +79577,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76334,7 +79585,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76350,7 +79601,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76359,7 +79610,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76373,15 +79624,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Makefile.in
+++ kppp/DB/Provider/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76391,7 +79642,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76399,7 +79650,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76412,9 +79663,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76426,7 +79677,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76434,7 +79685,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76450,7 +79701,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -412,7 +421,7 @@
+@@ -424,7 +433,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -76459,7 +79710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +459,9 @@
+@@ -462,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76473,15 +79724,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Netherlands/Makefile.in
+++ kppp/DB/Provider/Netherlands/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76491,7 +79742,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76499,7 +79750,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76512,9 +79763,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76526,7 +79777,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76534,7 +79785,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76550,7 +79801,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -467,7 +476,7 @@
+@@ -479,7 +488,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76559,7 +79810,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +514,9 @@
+@@ -517,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76571,7 +79822,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -666,7 +675,7 @@
+@@ -678,7 +687,7 @@
.NOEXPORT:
#>+ 2
@@ -76582,15 +79833,15 @@
docs-am:
--- kppp/DB/Provider/New_Zealand/Makefile.in
+++ kppp/DB/Provider/New_Zealand/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76600,7 +79851,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76608,7 +79859,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76621,9 +79872,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76635,7 +79886,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76643,7 +79894,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76659,7 +79910,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76668,7 +79919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76680,7 +79931,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -604,7 +613,7 @@
+@@ -616,7 +625,7 @@
.NOEXPORT:
#>+ 2
@@ -76691,15 +79942,15 @@
docs-am:
--- kppp/DB/Provider/Norway/Makefile.in
+++ kppp/DB/Provider/Norway/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76709,7 +79960,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76717,7 +79968,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76730,9 +79981,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76744,7 +79995,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76752,7 +80003,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76768,7 +80019,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76777,7 +80028,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76791,15 +80042,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Portugal/Makefile.in
+++ kppp/DB/Provider/Portugal/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76809,7 +80060,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76817,7 +80068,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76830,9 +80081,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76844,7 +80095,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76852,7 +80103,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76868,7 +80119,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76877,7 +80128,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76891,15 +80142,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Slovenia/Makefile.in
+++ kppp/DB/Provider/Slovenia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -76909,7 +80160,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -76917,7 +80168,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -76930,9 +80181,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -76944,7 +80195,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -76952,7 +80203,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -76968,7 +80219,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -76977,7 +80228,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76991,15 +80242,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Sweden/Makefile.in
+++ kppp/DB/Provider/Sweden/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77009,7 +80260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77017,7 +80268,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77030,9 +80281,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77044,7 +80295,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77052,7 +80303,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77068,7 +80319,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77077,7 +80328,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77091,15 +80342,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Switzerland/Makefile.in
+++ kppp/DB/Provider/Switzerland/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77109,7 +80360,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77117,7 +80368,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77130,9 +80381,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77144,7 +80395,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77152,7 +80403,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77168,7 +80419,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77177,7 +80428,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77191,15 +80442,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Taiwan/Makefile.in
+++ kppp/DB/Provider/Taiwan/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77209,7 +80460,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77217,7 +80468,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77230,9 +80481,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77244,7 +80495,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77252,7 +80503,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77268,7 +80519,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77277,7 +80528,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77291,15 +80542,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Ukraine/Makefile.in
+++ kppp/DB/Provider/Ukraine/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77309,7 +80560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77317,7 +80568,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77330,9 +80581,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77344,7 +80595,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77352,7 +80603,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77368,7 +80619,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77377,7 +80628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77391,15 +80642,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/United_Kingdom/Makefile.in
+++ kppp/DB/Provider/United_Kingdom/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77409,7 +80660,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77417,7 +80668,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77430,9 +80681,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77444,7 +80695,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77452,7 +80703,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77468,7 +80719,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77477,7 +80728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77491,15 +80742,15 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Yugoslavia/Makefile.in
+++ kppp/DB/Provider/Yugoslavia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77509,7 +80760,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77517,7 +80768,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77530,9 +80781,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77544,7 +80795,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77552,7 +80803,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77568,7 +80819,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -414,7 +423,7 @@
+@@ -426,7 +435,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77577,7 +80828,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +461,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77589,7 +80840,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -613,7 +622,7 @@
+@@ -625,7 +634,7 @@
.NOEXPORT:
#>+ 2
@@ -77600,15 +80851,15 @@
docs-am:
--- kppp/icons/Makefile.in
+++ kppp/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77618,7 +80869,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77626,7 +80877,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77639,9 +80890,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77653,7 +80904,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77661,7 +80912,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77677,7 +80928,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -393,7 +402,7 @@
+@@ -405,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -77686,7 +80937,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +440,9 @@
+@@ -443,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77698,7 +80949,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -583,26 +592,26 @@
+@@ -595,26 +604,26 @@
#>+ 22
install-kde-icons:
@@ -77736,15 +80987,15 @@
force-reedit:
--- kppp/logview/Makefile.in
+++ kppp/logview/Makefile.in
-@@ -164,6 +164,7 @@
+@@ -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@
-@@ -260,6 +261,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -262,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77754,7 +81005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -303,6 +307,7 @@
+@@ -309,6 +313,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77762,7 +81013,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -314,12 +319,9 @@
+@@ -320,12 +325,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77775,9 +81026,9 @@
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@
+@@ -346,10 +348,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77789,7 +81040,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -350,6 +355,7 @@
+@@ -358,6 +363,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77797,7 +81048,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -426,12 +432,15 @@
+@@ -438,12 +444,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77813,7 +81064,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -479,7 +488,7 @@
+@@ -491,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -77822,7 +81073,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +526,9 @@
+@@ -529,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77836,15 +81087,15 @@
@$(NORMAL_INSTALL)
--- kppp/Makefile.in
+++ kppp/Makefile.in
-@@ -187,6 +187,7 @@
+@@ -190,6 +190,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -285,6 +286,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77854,7 +81105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,6 +330,7 @@
+@@ -332,6 +336,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77862,7 +81113,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -337,12 +342,9 @@
+@@ -343,12 +348,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77875,9 +81126,9 @@
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@
+@@ -369,10 +371,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77889,7 +81140,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -373,6 +378,7 @@
+@@ -381,6 +386,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77897,7 +81148,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -449,12 +455,15 @@
+@@ -461,12 +467,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -77913,7 +81164,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -631,7 +640,7 @@
+@@ -643,7 +652,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -77922,7 +81173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -669,9 +678,9 @@
+@@ -681,9 +690,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -77936,15 +81187,15 @@
@$(NORMAL_INSTALL)
--- kppp/pixmaps/Makefile.in
+++ kppp/pixmaps/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -77954,7 +81205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -77962,7 +81213,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -77975,9 +81226,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -77989,7 +81240,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -77997,7 +81248,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78013,7 +81264,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -411,7 +420,7 @@
+@@ -423,7 +432,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78022,7 +81273,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +458,9 @@
+@@ -461,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78036,15 +81287,15 @@
mostlyclean-libtool:
--- kppp/Rules/Argentina/Makefile.in
+++ kppp/Rules/Argentina/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78054,7 +81305,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78062,7 +81313,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78075,9 +81326,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78089,7 +81340,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78097,7 +81348,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78113,7 +81364,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78122,7 +81373,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78136,15 +81387,15 @@
mostlyclean-libtool:
--- kppp/Rules/Australia/Makefile.in
+++ kppp/Rules/Australia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78154,7 +81405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78162,7 +81413,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78175,9 +81426,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78189,7 +81440,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78197,7 +81448,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78213,7 +81464,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -411,7 +420,7 @@
+@@ -423,7 +432,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78222,7 +81473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +458,9 @@
+@@ -461,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78236,15 +81487,15 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Business_1/Makefile.in
+++ kppp/Rules/Austria/Business_1/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78254,7 +81505,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78262,7 +81513,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78275,9 +81526,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78289,7 +81540,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78297,7 +81548,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78313,7 +81564,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78322,7 +81573,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78336,15 +81587,15 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Business_2/Makefile.in
+++ kppp/Rules/Austria/Business_2/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78354,7 +81605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78362,7 +81613,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78375,9 +81626,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78389,7 +81640,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78397,7 +81648,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78413,7 +81664,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78422,7 +81673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78436,15 +81687,15 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Makefile.in
+++ kppp/Rules/Austria/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78454,7 +81705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78462,7 +81713,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78475,9 +81726,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78489,7 +81740,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78497,7 +81748,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78513,7 +81764,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -413,7 +422,7 @@
+@@ -425,7 +434,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -78522,7 +81773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +460,9 @@
+@@ -463,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78536,15 +81787,15 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Minimum/Makefile.in
+++ kppp/Rules/Austria/Minimum/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78554,7 +81805,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78562,7 +81813,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78575,9 +81826,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78589,7 +81840,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78597,7 +81848,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78613,7 +81864,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78622,7 +81873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78636,15 +81887,15 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Standard/Makefile.in
+++ kppp/Rules/Austria/Standard/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78654,7 +81905,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78662,7 +81913,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78675,9 +81926,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78689,7 +81940,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78697,7 +81948,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78713,7 +81964,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78722,7 +81973,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78736,15 +81987,15 @@
mostlyclean-libtool:
--- kppp/Rules/Bangladesh/Makefile.in
+++ kppp/Rules/Bangladesh/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78754,7 +82005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78762,7 +82013,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78775,9 +82026,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78789,7 +82040,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78797,7 +82048,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78813,7 +82064,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78822,7 +82073,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78836,15 +82087,15 @@
mostlyclean-libtool:
--- kppp/Rules/Belgium/Makefile.in
+++ kppp/Rules/Belgium/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78854,7 +82105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78862,7 +82113,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78875,9 +82126,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78889,7 +82140,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78897,7 +82148,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -78913,7 +82164,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -78922,7 +82173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -78936,15 +82187,15 @@
mostlyclean-libtool:
--- kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
+++ kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -78954,7 +82205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -78962,7 +82213,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -78975,9 +82226,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -78989,7 +82240,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -78997,7 +82248,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79013,7 +82264,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79022,7 +82273,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79036,15 +82287,15 @@
mostlyclean-libtool:
--- kppp/Rules/Brasil/Makefile.in
+++ kppp/Rules/Brasil/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79054,7 +82305,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79062,7 +82313,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79075,9 +82326,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79089,7 +82340,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79097,7 +82348,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79113,7 +82364,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79122,7 +82373,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79136,15 +82387,15 @@
mostlyclean-libtool:
--- kppp/Rules/Croatia/Makefile.in
+++ kppp/Rules/Croatia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79154,7 +82405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79162,7 +82413,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79175,9 +82426,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79189,7 +82440,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79197,7 +82448,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79213,7 +82464,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79222,7 +82473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79236,15 +82487,15 @@
mostlyclean-libtool:
--- kppp/Rules/Czechia/Makefile.in
+++ kppp/Rules/Czechia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79254,7 +82505,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79262,7 +82513,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79275,9 +82526,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79289,7 +82540,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79297,7 +82548,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79313,7 +82564,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79322,7 +82573,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79336,15 +82587,15 @@
mostlyclean-libtool:
--- kppp/Rules/Denmark/Makefile.in
+++ kppp/Rules/Denmark/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79354,7 +82605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79362,7 +82613,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79375,9 +82626,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79389,7 +82640,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79397,7 +82648,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79413,7 +82664,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -411,7 +420,7 @@
+@@ -423,7 +432,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79422,7 +82673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +458,9 @@
+@@ -461,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79436,15 +82687,15 @@
mostlyclean-libtool:
--- kppp/Rules/Estonia/Makefile.in
+++ kppp/Rules/Estonia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79454,7 +82705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79462,7 +82713,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79475,9 +82726,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79489,7 +82740,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79497,7 +82748,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79513,7 +82764,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79522,7 +82773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79536,15 +82787,15 @@
mostlyclean-libtool:
--- kppp/Rules/Finland/Makefile.in
+++ kppp/Rules/Finland/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79554,7 +82805,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79562,7 +82813,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79575,9 +82826,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79589,7 +82840,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79597,7 +82848,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79613,7 +82864,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79622,7 +82873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79636,15 +82887,15 @@
mostlyclean-libtool:
--- kppp/Rules/France/Makefile.in
+++ kppp/Rules/France/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79654,7 +82905,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79662,7 +82913,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79675,9 +82926,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79689,7 +82940,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79697,7 +82948,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79713,7 +82964,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79722,7 +82973,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79736,15 +82987,15 @@
mostlyclean-libtool:
--- kppp/Rules/Germany/Makefile.in
+++ kppp/Rules/Germany/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79754,7 +83005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79762,7 +83013,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79775,9 +83026,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79789,7 +83040,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79797,7 +83048,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79813,7 +83064,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -434,7 +443,7 @@
+@@ -446,7 +455,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79822,7 +83073,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +481,9 @@
+@@ -484,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79836,15 +83087,15 @@
mostlyclean-libtool:
--- kppp/Rules/Greece/Makefile.in
+++ kppp/Rules/Greece/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79854,7 +83105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79862,7 +83113,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79875,9 +83126,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79889,7 +83140,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79897,7 +83148,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -79913,7 +83164,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -79922,7 +83173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -79936,15 +83187,15 @@
mostlyclean-libtool:
--- kppp/Rules/HongKong/Makefile.in
+++ kppp/Rules/HongKong/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -79954,7 +83205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -79962,7 +83213,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -79975,9 +83226,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -79989,7 +83240,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -79997,7 +83248,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80013,7 +83264,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80022,7 +83273,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80036,15 +83287,15 @@
mostlyclean-libtool:
--- kppp/Rules/Hungary/Makefile.in
+++ kppp/Rules/Hungary/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80054,7 +83305,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80062,7 +83313,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80075,9 +83326,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80089,7 +83340,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80097,7 +83348,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80113,7 +83364,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80122,7 +83373,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80136,15 +83387,15 @@
mostlyclean-libtool:
--- kppp/Rules/Iceland/Makefile.in
+++ kppp/Rules/Iceland/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80154,7 +83405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80162,7 +83413,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80175,9 +83426,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80189,7 +83440,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80197,7 +83448,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80213,7 +83464,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80222,7 +83473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80234,7 +83485,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -604,7 +613,7 @@
+@@ -616,7 +625,7 @@
.NOEXPORT:
#>+ 2
@@ -80245,15 +83496,15 @@
docs-am:
--- kppp/Rules/India/Makefile.in
+++ kppp/Rules/India/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80263,7 +83514,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80271,7 +83522,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80284,9 +83535,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80298,7 +83549,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80306,7 +83557,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80322,7 +83573,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80331,7 +83582,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80345,15 +83596,15 @@
mostlyclean-libtool:
--- kppp/Rules/Indonesia/Makefile.in
+++ kppp/Rules/Indonesia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80363,7 +83614,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80371,7 +83622,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80384,9 +83635,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80398,7 +83649,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80406,7 +83657,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80422,7 +83673,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80431,7 +83682,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80445,15 +83696,15 @@
mostlyclean-libtool:
--- kppp/Rules/Ireland/Makefile.in
+++ kppp/Rules/Ireland/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80463,7 +83714,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80471,7 +83722,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80484,9 +83735,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80498,7 +83749,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80506,7 +83757,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80522,7 +83773,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80531,7 +83782,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80545,15 +83796,15 @@
mostlyclean-libtool:
--- kppp/Rules/Israel/Makefile.in
+++ kppp/Rules/Israel/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80563,7 +83814,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80571,7 +83822,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80584,9 +83835,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80598,7 +83849,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80606,7 +83857,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80622,7 +83873,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80631,7 +83882,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80645,15 +83896,15 @@
mostlyclean-libtool:
--- kppp/Rules/Italy/Makefile.in
+++ kppp/Rules/Italy/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80663,7 +83914,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80671,7 +83922,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80684,9 +83935,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80698,7 +83949,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80706,7 +83957,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80722,7 +83973,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -434,7 +443,7 @@
+@@ -446,7 +455,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80731,7 +83982,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +481,9 @@
+@@ -484,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80743,7 +83994,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,7 +642,7 @@
+@@ -645,7 +654,7 @@
.NOEXPORT:
#>+ 2
@@ -80754,15 +84005,15 @@
docs-am:
--- kppp/Rules/Jamaica/Makefile.in
+++ kppp/Rules/Jamaica/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80772,7 +84023,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80780,7 +84031,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80793,9 +84044,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80807,7 +84058,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80815,7 +84066,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80831,7 +84082,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80840,7 +84091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80854,15 +84105,15 @@
mostlyclean-libtool:
--- kppp/Rules/Japan/Makefile.in
+++ kppp/Rules/Japan/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80872,7 +84123,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80880,7 +84131,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80893,9 +84144,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -80907,7 +84158,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -80915,7 +84166,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -80931,7 +84182,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -80940,7 +84191,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -80954,15 +84205,15 @@
mostlyclean-libtool:
--- kppp/Rules/Kazakhstan/Makefile.in
+++ kppp/Rules/Kazakhstan/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -80972,7 +84223,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -80980,7 +84231,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -80993,9 +84244,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81007,7 +84258,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81015,7 +84266,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81031,7 +84282,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81040,7 +84291,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81054,15 +84305,15 @@
mostlyclean-libtool:
--- kppp/Rules/Luxembourg/Makefile.in
+++ kppp/Rules/Luxembourg/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81072,7 +84323,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81080,7 +84331,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81093,9 +84344,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81107,7 +84358,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81115,7 +84366,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81131,7 +84382,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81140,7 +84391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81154,15 +84405,15 @@
mostlyclean-libtool:
--- kppp/Rules/Macedonia/Makefile.in
+++ kppp/Rules/Macedonia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81172,7 +84423,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81180,7 +84431,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81193,9 +84444,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81207,7 +84458,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81215,7 +84466,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81231,7 +84482,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81240,7 +84491,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81254,15 +84505,15 @@
mostlyclean-libtool:
--- kppp/Rules/Makefile.in
+++ kppp/Rules/Makefile.in
-@@ -129,6 +129,7 @@
+@@ -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@
-@@ -225,6 +226,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -227,6 +228,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81272,7 +84523,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -268,6 +272,7 @@
+@@ -274,6 +278,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81280,7 +84531,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -279,12 +284,9 @@
+@@ -285,12 +290,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81293,9 +84544,9 @@
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@
+@@ -311,10 +313,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81307,7 +84558,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -315,6 +320,7 @@
+@@ -323,6 +328,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81315,7 +84566,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -391,12 +397,15 @@
+@@ -403,12 +409,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81331,7 +84582,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -418,7 +427,7 @@
+@@ -430,7 +439,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -81340,7 +84591,7 @@
pkg_DATA = TEMPLATE
pkg_SCRIPTS = checkrules
pkgdir = $(kde_datadir)/kppp/Rules
-@@ -428,7 +437,7 @@
+@@ -440,7 +449,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -81349,7 +84600,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +475,9 @@
+@@ -478,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81363,15 +84614,15 @@
@$(NORMAL_INSTALL)
--- kppp/Rules/Malaysia/Makefile.in
+++ kppp/Rules/Malaysia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81381,7 +84632,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81389,7 +84640,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81402,9 +84653,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81416,7 +84667,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81424,7 +84675,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81440,7 +84691,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81449,7 +84700,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81463,15 +84714,15 @@
mostlyclean-libtool:
--- kppp/Rules/Netherlands/Makefile.in
+++ kppp/Rules/Netherlands/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81481,7 +84732,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81489,7 +84740,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81502,9 +84753,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81516,7 +84767,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81524,7 +84775,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81540,7 +84791,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -434,7 +443,7 @@
+@@ -446,7 +455,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81549,7 +84800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +481,9 @@
+@@ -484,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81561,7 +84812,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,7 +642,7 @@
+@@ -645,7 +654,7 @@
.NOEXPORT:
#>+ 2
@@ -81572,15 +84823,15 @@
docs-am:
--- kppp/Rules/Norway/Makefile.in
+++ kppp/Rules/Norway/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81590,7 +84841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81598,7 +84849,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81611,9 +84862,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81625,7 +84876,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81633,7 +84884,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81649,7 +84900,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81658,7 +84909,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81672,15 +84923,15 @@
mostlyclean-libtool:
--- kppp/Rules/Poland/Makefile.in
+++ kppp/Rules/Poland/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81690,7 +84941,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81698,7 +84949,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81711,9 +84962,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81725,7 +84976,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81733,7 +84984,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81749,7 +85000,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -413,7 +422,7 @@
+@@ -425,7 +434,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81758,7 +85009,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +460,9 @@
+@@ -463,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81772,15 +85023,15 @@
mostlyclean-libtool:
--- kppp/Rules/Portugal/Makefile.in
+++ kppp/Rules/Portugal/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81790,7 +85041,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81798,7 +85049,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81811,9 +85062,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81825,7 +85076,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81833,7 +85084,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81849,7 +85100,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81858,7 +85109,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81872,15 +85123,15 @@
mostlyclean-libtool:
--- kppp/Rules/Romania/Makefile.in
+++ kppp/Rules/Romania/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81890,7 +85141,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81898,7 +85149,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -81911,9 +85162,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -81925,7 +85176,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -81933,7 +85184,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -81949,7 +85200,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -81958,7 +85209,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81972,15 +85223,15 @@
mostlyclean-libtool:
--- kppp/Rules/Russia/Makefile.in
+++ kppp/Rules/Russia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -81990,7 +85241,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -81998,7 +85249,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82011,9 +85262,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82025,7 +85276,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82033,7 +85284,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82049,7 +85300,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82058,7 +85309,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82072,15 +85323,15 @@
mostlyclean-libtool:
--- kppp/Rules/Singapore/Makefile.in
+++ kppp/Rules/Singapore/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82090,7 +85341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82098,7 +85349,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82111,9 +85362,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82125,7 +85376,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82133,7 +85384,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82149,7 +85400,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82158,7 +85409,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82172,15 +85423,15 @@
mostlyclean-libtool:
--- kppp/Rules/Slovakia/Makefile.in
+++ kppp/Rules/Slovakia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82190,7 +85441,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82198,7 +85449,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82211,9 +85462,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82225,7 +85476,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82233,7 +85484,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82249,7 +85500,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82258,7 +85509,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82272,15 +85523,15 @@
mostlyclean-libtool:
--- kppp/Rules/Slovenia/Makefile.in
+++ kppp/Rules/Slovenia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82290,7 +85541,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82298,7 +85549,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82311,9 +85562,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82325,7 +85576,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82333,7 +85584,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82349,7 +85600,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -408,7 +417,7 @@
+@@ -420,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82358,7 +85609,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +455,9 @@
+@@ -458,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82372,15 +85623,15 @@
mostlyclean-libtool:
--- kppp/Rules/SouthAfrica/Makefile.in
+++ kppp/Rules/SouthAfrica/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82390,7 +85641,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82398,7 +85649,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82411,9 +85662,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82425,7 +85676,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82433,7 +85684,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82449,7 +85700,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82458,7 +85709,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82472,15 +85723,15 @@
mostlyclean-libtool:
--- kppp/Rules/SouthAfrika/Makefile.in
+++ kppp/Rules/SouthAfrika/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82490,7 +85741,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82498,7 +85749,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82511,9 +85762,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82525,7 +85776,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82533,7 +85784,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82549,7 +85800,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82558,7 +85809,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82572,15 +85823,15 @@
mostlyclean-libtool:
--- kppp/Rules/Spain/Makefile.in
+++ kppp/Rules/Spain/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82590,7 +85841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82598,7 +85849,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82611,9 +85862,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82625,7 +85876,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82633,7 +85884,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82649,7 +85900,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -410,7 +419,7 @@
+@@ -422,7 +431,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82658,7 +85909,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +457,9 @@
+@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82672,15 +85923,15 @@
mostlyclean-libtool:
--- kppp/Rules/Sweden/Makefile.in
+++ kppp/Rules/Sweden/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82690,7 +85941,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82698,7 +85949,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82711,9 +85962,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82725,7 +85976,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82733,7 +85984,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82749,7 +86000,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -413,7 +422,7 @@
+@@ -425,7 +434,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82758,7 +86009,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +460,9 @@
+@@ -463,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82770,7 +86021,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -612,7 +621,7 @@
+@@ -624,7 +633,7 @@
.NOEXPORT:
#>+ 2
@@ -82781,15 +86032,15 @@
docs-am:
--- kppp/Rules/Switzerland/Makefile.in
+++ kppp/Rules/Switzerland/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82799,7 +86050,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82807,7 +86058,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82820,9 +86071,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82834,7 +86085,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82842,7 +86093,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82858,7 +86109,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -411,7 +420,7 @@
+@@ -423,7 +432,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82867,7 +86118,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +458,9 @@
+@@ -461,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82881,15 +86132,15 @@
mostlyclean-libtool:
--- kppp/Rules/Turkey/Makefile.in
+++ kppp/Rules/Turkey/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82899,7 +86150,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -82907,7 +86158,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -82920,9 +86171,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -82934,7 +86185,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -82942,7 +86193,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -82958,7 +86209,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -82967,7 +86218,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -82981,15 +86232,15 @@
mostlyclean-libtool:
--- kppp/Rules/Ukraine/Makefile.in
+++ kppp/Rules/Ukraine/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -82999,7 +86250,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83007,7 +86258,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83020,9 +86271,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83034,7 +86285,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83042,7 +86293,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83058,7 +86309,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -83067,7 +86318,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83081,15 +86332,15 @@
mostlyclean-libtool:
--- kppp/Rules/United_Kingdom/Makefile.in
+++ kppp/Rules/United_Kingdom/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83099,7 +86350,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83107,7 +86358,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83120,9 +86371,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83134,7 +86385,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83142,7 +86393,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83158,7 +86409,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -413,7 +422,7 @@
+@@ -425,7 +434,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -83167,7 +86418,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +460,9 @@
+@@ -463,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83181,15 +86432,15 @@
mostlyclean-libtool:
--- kppp/Rules/Uruguay/Makefile.in
+++ kppp/Rules/Uruguay/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83199,7 +86450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83207,7 +86458,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83220,9 +86471,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83234,7 +86485,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83242,7 +86493,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83258,7 +86509,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -405,7 +414,7 @@
+@@ -417,7 +426,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -83267,7 +86518,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +452,9 @@
+@@ -455,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83281,15 +86532,15 @@
mostlyclean-libtool:
--- kppp/Rules/Yugoslavia/Makefile.in
+++ kppp/Rules/Yugoslavia/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83299,7 +86550,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83307,7 +86558,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83320,9 +86571,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83334,7 +86585,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83342,7 +86593,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83358,7 +86609,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -83367,7 +86618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83379,7 +86630,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -608,7 +617,7 @@
+@@ -620,7 +629,7 @@
.NOEXPORT:
#>+ 2
@@ -83390,15 +86641,15 @@
docs-am:
--- krdc/Makefile.in
+++ krdc/Makefile.in
-@@ -183,6 +183,7 @@
+@@ -186,6 +186,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -281,6 +282,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83408,7 +86659,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,6 +326,7 @@
+@@ -328,6 +332,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83416,7 +86667,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -333,12 +338,9 @@
+@@ -339,12 +344,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83429,9 +86680,9 @@
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@
+@@ -365,10 +367,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83443,7 +86694,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -369,6 +374,7 @@
+@@ -377,6 +382,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83451,7 +86702,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -445,12 +451,15 @@
+@@ -457,12 +463,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83467,7 +86718,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -508,7 +517,7 @@
+@@ -520,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83476,7 +86727,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +555,9 @@
+@@ -558,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83488,7 +86739,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1057,11 +1066,11 @@
+@@ -1069,11 +1078,11 @@
mocs: kfullscreenpanel.moc
#>+ 3
@@ -83503,7 +86754,7 @@
#>+ 3
keycapturedialog.moc: $(srcdir)/keycapturedialog.h
-@@ -1071,11 +1080,11 @@
+@@ -1083,11 +1092,11 @@
mocs: keycapturedialog.moc
#>+ 3
@@ -83518,7 +86769,7 @@
#>+ 3
maindialog.moc: $(srcdir)/maindialog.h
-@@ -1086,7 +1095,7 @@
+@@ -1098,7 +1107,7 @@
#>+ 3
clean-metasources:
@@ -83527,7 +86778,7 @@
#>+ 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 +1112,14 @@
+@@ -1115,14 +1124,14 @@
#>+ 10
install-kde-icons:
@@ -83545,7 +86796,7 @@
#>+ 15
force-reedit:
-@@ -1151,7 +1160,7 @@
+@@ -1163,7 +1172,7 @@
#>+ 11
@@ -83556,15 +86807,15 @@
echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
--- krdc/rdp/Makefile.in
+++ krdc/rdp/Makefile.in
-@@ -137,6 +137,7 @@
+@@ -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@
-@@ -233,6 +234,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -235,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83574,7 +86825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -276,6 +280,7 @@
+@@ -282,6 +286,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83582,7 +86833,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -287,12 +292,9 @@
+@@ -293,12 +298,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83595,9 +86846,9 @@
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@
+@@ -319,10 +321,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83609,7 +86860,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -323,6 +328,7 @@
+@@ -331,6 +336,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83617,7 +86868,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -399,12 +405,15 @@
+@@ -411,12 +417,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83633,7 +86884,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -439,7 +448,7 @@
+@@ -451,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83642,7 +86893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +486,9 @@
+@@ -489,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83656,15 +86907,15 @@
clean-noinstLTLIBRARIES:
--- krdc/vnc/Makefile.in
+++ krdc/vnc/Makefile.in
-@@ -147,6 +147,7 @@
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -245,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83674,7 +86925,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -292,6 +296,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83682,7 +86933,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -303,12 +308,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83695,9 +86946,9 @@
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@
+@@ -329,10 +331,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83709,7 +86960,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83717,7 +86968,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -421,12 +427,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83733,7 +86984,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -455,7 +464,7 @@
+@@ -467,7 +476,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -83742,7 +86993,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +502,9 @@
+@@ -505,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83756,15 +87007,15 @@
clean-noinstLTLIBRARIES:
--- krfb/kcm_krfb/Makefile.in
+++ krfb/kcm_krfb/Makefile.in
-@@ -147,6 +147,7 @@
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -245,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83774,7 +87025,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -292,6 +296,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83782,7 +87033,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -303,12 +308,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83795,9 +87046,9 @@
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@
+@@ -329,10 +331,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83809,7 +87060,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83817,7 +87068,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -421,12 +427,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83833,7 +87084,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -458,7 +467,7 @@
+@@ -470,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83842,7 +87093,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +505,9 @@
+@@ -508,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83854,7 +87105,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -798,7 +807,7 @@
+@@ -810,7 +819,7 @@
-rm -f kcm_krfb.moc
#>+ 2
@@ -83865,15 +87116,15 @@
clean-ui:
--- krfb/kinetd/Makefile.in
+++ krfb/kinetd/Makefile.in
-@@ -148,6 +148,7 @@
+@@ -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@
-@@ -244,6 +245,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -246,6 +247,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83883,7 +87134,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -287,6 +291,7 @@
+@@ -293,6 +297,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83891,7 +87142,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -298,12 +303,9 @@
+@@ -304,12 +309,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -83904,9 +87155,9 @@
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@
+@@ -330,10 +332,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -83918,7 +87169,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -334,6 +339,7 @@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -83926,7 +87177,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -410,12 +416,15 @@
+@@ -422,12 +428,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -83942,7 +87193,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -463,7 +472,7 @@
+@@ -475,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -83951,7 +87202,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +510,9 @@
+@@ -513,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -83965,15 +87216,15 @@
@$(NORMAL_INSTALL)
--- krfb/krfb/Makefile.in
+++ krfb/krfb/Makefile.in
-@@ -171,6 +171,7 @@
+@@ -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@
-@@ -267,6 +268,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -269,6 +270,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -83983,7 +87234,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -310,6 +314,7 @@
+@@ -316,6 +320,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -83991,7 +87242,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -321,12 +326,9 @@
+@@ -327,12 +332,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84004,9 +87255,9 @@
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@
+@@ -353,10 +355,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84018,7 +87269,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -357,6 +362,7 @@
+@@ -365,6 +370,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84026,7 +87277,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -433,12 +439,15 @@
+@@ -445,12 +451,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84042,7 +87293,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -496,7 +505,7 @@
+@@ -508,7 +517,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -84051,7 +87302,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +543,9 @@
+@@ -546,9 +555,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84063,7 +87314,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -972,7 +981,7 @@
+@@ -984,7 +993,7 @@
-rm -f invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
#>+ 2
@@ -84072,7 +87323,7 @@
#>+ 5
clean-idl:
-@@ -995,21 +1004,21 @@
+@@ -1007,21 +1016,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
@@ -84102,15 +87353,15 @@
force-reedit:
--- krfb/krfb_httpd/Makefile.in
+++ krfb/krfb_httpd/Makefile.in
-@@ -113,6 +113,7 @@
+@@ -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@
-@@ -209,6 +210,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -211,6 +212,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84120,7 +87371,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -252,6 +256,7 @@
+@@ -258,6 +262,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84128,7 +87379,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -263,12 +268,9 @@
+@@ -269,12 +274,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84141,9 +87392,9 @@
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@
+@@ -295,10 +297,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84155,7 +87406,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -299,6 +304,7 @@
+@@ -307,6 +312,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84163,7 +87414,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -375,12 +381,15 @@
+@@ -387,12 +393,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84179,7 +87430,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84188,7 +87439,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84202,15 +87453,15 @@
@$(NORMAL_INSTALL)
--- krfb/libvncserver/Makefile.in
+++ krfb/libvncserver/Makefile.in
-@@ -130,6 +130,7 @@
+@@ -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@
-@@ -226,6 +227,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -228,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84220,7 +87471,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,6 +273,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84228,7 +87479,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -280,12 +285,9 @@
+@@ -286,12 +291,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84241,9 +87492,9 @@
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@
+@@ -312,10 +314,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84255,7 +87506,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -316,6 +321,7 @@
+@@ -324,6 +329,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84263,7 +87514,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -392,12 +398,15 @@
+@@ -404,12 +410,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84279,7 +87530,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -433,7 +442,7 @@
+@@ -445,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -84288,7 +87539,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +480,9 @@
+@@ -483,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84302,15 +87553,15 @@
clean-noinstLTLIBRARIES:
--- krfb/Makefile.in
+++ krfb/Makefile.in
-@@ -117,6 +117,7 @@
+@@ -120,6 +120,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -215,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84320,7 +87571,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -256,6 +260,7 @@
+@@ -262,6 +266,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84328,7 +87579,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -267,12 +272,9 @@
+@@ -273,12 +278,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84341,9 +87592,9 @@
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@
+@@ -299,10 +301,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84355,7 +87606,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -303,6 +308,7 @@
+@@ -311,6 +316,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84363,7 +87614,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -379,12 +385,15 @@
+@@ -391,12 +397,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84379,7 +87630,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -415,7 +424,7 @@
+@@ -427,7 +436,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -84388,7 +87639,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +462,9 @@
+@@ -465,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84402,15 +87653,15 @@
mostlyclean-libtool:
--- krfb/srvloc/Makefile.in
+++ krfb/srvloc/Makefile.in
-@@ -140,6 +140,7 @@
+@@ -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@
-@@ -236,6 +237,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -238,6 +239,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84420,7 +87671,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -279,6 +283,7 @@
+@@ -285,6 +289,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84428,7 +87679,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -290,12 +295,9 @@
+@@ -296,12 +301,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84441,9 +87692,9 @@
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@
+@@ -322,10 +324,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84455,7 +87706,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -326,6 +331,7 @@
+@@ -334,6 +339,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84463,7 +87714,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -402,12 +408,15 @@
+@@ -414,12 +420,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84479,7 +87730,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -451,7 +460,7 @@
+@@ -463,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -84488,7 +87739,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +498,9 @@
+@@ -501,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84502,15 +87753,15 @@
clean-noinstLTLIBRARIES:
--- ksirc/icons/Makefile.in
+++ ksirc/icons/Makefile.in
-@@ -100,6 +100,7 @@
+@@ -103,6 +103,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -198,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84520,7 +87771,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -239,6 +243,7 @@
+@@ -245,6 +249,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84528,7 +87779,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -250,12 +255,9 @@
+@@ -256,12 +261,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84541,9 +87792,9 @@
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@
+@@ -282,10 +284,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84555,7 +87806,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -286,6 +291,7 @@
+@@ -294,6 +299,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84563,7 +87814,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -362,12 +368,15 @@
+@@ -374,12 +380,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84579,7 +87830,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -397,7 +406,7 @@
+@@ -409,7 +418,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84588,7 +87839,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +444,9 @@
+@@ -447,9 +456,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84600,7 +87851,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -587,42 +596,42 @@
+@@ -599,42 +608,42 @@
#>+ 39
install-kde-icons:
@@ -84660,15 +87911,15 @@
#>+ 15
--- ksirc/img/emoticons/Makefile.in
+++ ksirc/img/emoticons/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84678,7 +87929,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84686,7 +87937,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84699,9 +87950,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84713,7 +87964,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84721,7 +87972,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84737,7 +87988,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -84746,7 +87997,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84760,15 +88011,15 @@
mostlyclean-libtool:
--- ksirc/img/Makefile.in
+++ ksirc/img/Makefile.in
-@@ -126,6 +126,7 @@
+@@ -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@
-@@ -222,6 +223,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -224,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84778,7 +88029,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -265,6 +269,7 @@
+@@ -271,6 +275,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84786,7 +88037,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -276,12 +281,9 @@
+@@ -282,12 +287,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84799,9 +88050,9 @@
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@
+@@ -308,10 +310,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84813,7 +88064,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -312,6 +317,7 @@
+@@ -320,6 +325,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84821,7 +88072,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -388,12 +394,15 @@
+@@ -400,12 +406,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84837,7 +88088,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -436,7 +445,7 @@
+@@ -448,7 +457,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -84846,7 +88097,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +483,9 @@
+@@ -486,9 +495,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84858,7 +88109,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -784,7 +793,7 @@
+@@ -796,7 +805,7 @@
.NOEXPORT:
#>+ 2
@@ -84869,15 +88120,15 @@
docs-am:
--- ksirc/KSOpenkSirc/Makefile.in
+++ ksirc/KSOpenkSirc/Makefile.in
-@@ -148,6 +148,7 @@
+@@ -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@
-@@ -244,6 +245,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -246,6 +247,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84887,7 +88138,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -287,6 +291,7 @@
+@@ -293,6 +297,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84895,7 +88146,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -298,12 +303,9 @@
+@@ -304,12 +309,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -84908,9 +88159,9 @@
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@
+@@ -330,10 +332,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -84922,7 +88173,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -334,6 +339,7 @@
+@@ -342,6 +347,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -84930,7 +88181,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -410,12 +416,15 @@
+@@ -422,12 +428,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -84946,7 +88197,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -471,7 +480,7 @@
+@@ -483,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -84955,7 +88206,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +518,9 @@
+@@ -521,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84969,15 +88220,15 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSPrefs/Makefile.in
+++ ksirc/KSPrefs/Makefile.in
-@@ -142,6 +142,7 @@
+@@ -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@
-@@ -238,6 +239,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -240,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -84987,7 +88238,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -281,6 +285,7 @@
+@@ -287,6 +291,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -84995,7 +88246,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -292,12 +297,9 @@
+@@ -298,12 +303,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85008,9 +88259,9 @@
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@
+@@ -324,10 +326,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -85022,7 +88273,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -328,6 +333,7 @@
+@@ -336,6 +341,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85030,7 +88281,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -404,12 +410,15 @@
+@@ -416,12 +422,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85046,7 +88297,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -503,7 +512,7 @@
+@@ -515,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -85055,7 +88306,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +550,9 @@
+@@ -553,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85069,15 +88320,15 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSProgress/Makefile.in
+++ ksirc/KSProgress/Makefile.in
-@@ -136,6 +136,7 @@
+@@ -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@
-@@ -232,6 +233,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -234,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85087,7 +88338,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -275,6 +279,7 @@
+@@ -281,6 +285,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85095,7 +88346,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -286,12 +291,9 @@
+@@ -292,12 +297,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85108,9 +88359,9 @@
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@
+@@ -318,10 +320,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -85122,7 +88373,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -322,6 +327,7 @@
+@@ -330,6 +335,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85130,7 +88381,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -398,12 +404,15 @@
+@@ -410,12 +416,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85146,7 +88397,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -435,7 +444,7 @@
+@@ -447,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -85155,7 +88406,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +482,9 @@
+@@ -485,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85169,15 +88420,15 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSTicker/Makefile.in
+++ ksirc/KSTicker/Makefile.in
-@@ -146,6 +146,7 @@
+@@ -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@
-@@ -242,6 +243,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -244,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85187,7 +88438,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -285,6 +289,7 @@
+@@ -291,6 +295,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85195,7 +88446,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -296,12 +301,9 @@
+@@ -302,12 +307,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85208,9 +88459,9 @@
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@
+@@ -328,10 +330,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -85222,7 +88473,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -332,6 +337,7 @@
+@@ -340,6 +345,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85230,7 +88481,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -408,12 +414,15 @@
+@@ -420,12 +426,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85246,7 +88497,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -451,7 +460,7 @@
+@@ -463,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -85255,7 +88506,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +498,9 @@
+@@ -501,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85269,38 +88520,15 @@
clean-noinstLTLIBRARIES:
--- ksirc/Makefile.in
+++ ksirc/Makefile.in
-@@ -102,8 +102,9 @@
- #>- dccMgrTest_OBJECTS = $(am_dccMgrTest_OBJECTS)
- #>+ 1
- dccMgrTest_OBJECTS = dccMgrTest.$(OBJEXT)
--dccMgrTest_DEPENDENCIES = dccManager.lo dccManagerbase.lo \
-- $(am__DEPENDENCIES_1)
-+dccMgrTest_DEPENDENCIES = dccManager.lo dccManagerbase.lo dccNew.lo \
-+ dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo \
-+ nickColourMaker.lo $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_getdate_OBJECTS = getdate.$(OBJEXT)
- #>- getdate_OBJECTS = $(am_getdate_OBJECTS)
- #>+ 1
-@@ -113,7 +114,9 @@
- #>- testview_OBJECTS = $(am_testview_OBJECTS)
- #>+ 1
- testview_OBJECTS = kstextviewtest.$(OBJEXT)
--testview_DEPENDENCIES = kstextview.lo $(am__DEPENDENCIES_1)
-+testview_DEPENDENCIES = kstextview.lo dccNew.lo dccNewbase.lo \
-+ alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(bin_SCRIPTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -227,6 +230,7 @@
+@@ -233,6 +233,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 +327,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -328,6 +329,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85310,7 +88538,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,6 +373,7 @@
+@@ -375,6 +379,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85318,7 +88546,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -377,12 +385,9 @@
+@@ -386,12 +391,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85331,9 +88559,9 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,10 +406,13 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
+@@ -412,10 +414,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -85345,7 +88573,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -413,6 +421,7 @@
+@@ -424,6 +429,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85353,7 +88581,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -489,12 +498,15 @@
+@@ -504,12 +510,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85369,20 +88597,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -523,10 +535,10 @@
- SUBDIRS = KSTicker KSProgress KSPrefs KSOpenkSirc img icons
- #>- METASOURCES = AUTO
- testview_SOURCES = kstextviewtest.cpp
--testview_LDADD = kstextview.lo $(LIB_KDEUI)
-+testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
- testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- dccMgrTest_SOURCES = dccMgrTest.cpp
--dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo $(LIB_KDEUI)
-+dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
- dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- #>- lib_LTLIBRARIES =
- #>+ 1
-@@ -687,7 +699,7 @@
+@@ -702,7 +711,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -85391,7 +88606,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -725,9 +737,9 @@
+@@ -740,9 +749,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85403,7 +88618,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1356,18 +1368,18 @@
+@@ -1371,18 +1380,18 @@
ksirc_DEPENDENCIES = libkdeinit_ksirc.la
#>+ 3
@@ -85428,7 +88643,7 @@
#>+ 3
ioDCC.moc: $(srcdir)/ioDCC.h
-@@ -1384,13 +1396,6 @@
+@@ -1399,13 +1408,6 @@
mocs: ssfeprompt.moc
#>+ 3
@@ -85442,7 +88657,7 @@
FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
-@@ -1405,6 +1410,13 @@
+@@ -1420,6 +1422,13 @@
mocs: ahistlineedit.moc
#>+ 3
@@ -85456,7 +88671,7 @@
alistbox.moc: $(srcdir)/alistbox.h
$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
-@@ -1433,13 +1445,6 @@
+@@ -1448,13 +1457,6 @@
mocs: ksview.moc
#>+ 3
@@ -85470,7 +88685,7 @@
ioLAG.moc: $(srcdir)/ioLAG.h
$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
-@@ -1447,18 +1452,18 @@
+@@ -1462,18 +1464,18 @@
mocs: ioLAG.moc
#>+ 3
@@ -85495,7 +88710,7 @@
#>+ 3
colorpicker.moc: $(srcdir)/colorpicker.h
-@@ -1475,6 +1480,13 @@
+@@ -1490,6 +1492,13 @@
mocs: objFinder.moc
#>+ 3
@@ -85509,7 +88724,7 @@
displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
-@@ -1503,18 +1515,18 @@
+@@ -1518,18 +1527,18 @@
mocs: dccToplevel.moc
#>+ 3
@@ -85534,7 +88749,7 @@
#>+ 3
dockservercontroller.moc: $(srcdir)/dockservercontroller.h
-@@ -1539,7 +1551,7 @@
+@@ -1554,7 +1563,7 @@
#>+ 3
clean-metasources:
@@ -85543,7 +88758,7 @@
#>+ 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 +1605,7 @@
+@@ -1608,7 +1617,7 @@
#>+ 11
@@ -85554,15 +88769,15 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
--- ksirc/puke/Makefile.in
+++ ksirc/puke/Makefile.in
-@@ -152,6 +152,7 @@
+@@ -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@
-@@ -248,6 +249,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -250,6 +251,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85572,7 +88787,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -291,6 +295,7 @@
+@@ -297,6 +301,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85580,7 +88795,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -302,12 +307,9 @@
+@@ -308,12 +313,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85593,9 +88808,9 @@
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@
+@@ -334,10 +336,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -85607,7 +88822,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -338,6 +343,7 @@
+@@ -346,6 +351,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85615,7 +88830,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -414,12 +420,15 @@
+@@ -426,12 +432,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85631,7 +88846,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -482,7 +491,7 @@
+@@ -494,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -85640,7 +88855,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +529,9 @@
+@@ -532,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85652,7 +88867,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -896,18 +905,18 @@
+@@ -908,18 +917,18 @@
mocs: ptablevw.moc
#>+ 3
@@ -85677,7 +88892,7 @@
#>+ 3
pkfiledialog.moc: $(srcdir)/pkfiledialog.h
-@@ -918,7 +927,7 @@
+@@ -930,7 +939,7 @@
#>+ 3
clean-metasources:
@@ -85686,7 +88901,7 @@
#>+ 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 +974,7 @@
+@@ -977,7 +986,7 @@
#>+ 11
@@ -85697,15 +88912,15 @@
echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
--- ktalkd/kcmktalkd/Makefile.in
+++ ktalkd/kcmktalkd/Makefile.in
-@@ -149,6 +149,7 @@
+@@ -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@
-@@ -245,6 +246,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -247,6 +248,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85715,7 +88930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -288,6 +292,7 @@
+@@ -294,6 +298,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85723,7 +88938,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -299,12 +304,9 @@
+@@ -305,12 +310,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85736,9 +88951,9 @@
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@
+@@ -331,10 +333,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -85750,7 +88965,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -335,6 +340,7 @@
+@@ -343,6 +348,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85758,7 +88973,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -411,12 +417,15 @@
+@@ -423,12 +429,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85774,7 +88989,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -452,7 +461,7 @@
+@@ -464,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -85783,7 +88998,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +499,9 @@
+@@ -502,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85795,7 +89010,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -794,18 +803,18 @@
+@@ -806,18 +815,18 @@
mocs: answmachpage.moc
#>+ 3
@@ -85820,7 +89035,7 @@
#>+ 3
forwmachpage.moc: $(srcdir)/forwmachpage.h
-@@ -816,7 +825,7 @@
+@@ -828,7 +837,7 @@
#>+ 3
clean-metasources:
@@ -85829,7 +89044,7 @@
#>+ 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 +839,23 @@
+@@ -842,23 +851,23 @@
#>+ 19
install-kde-icons:
@@ -85862,7 +89077,7 @@
#>+ 15
force-reedit:
-@@ -887,7 +896,7 @@
+@@ -899,7 +908,7 @@
#>+ 11
@@ -85873,15 +89088,15 @@
echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
--- ktalkd/ktalkd/machines/Makefile.in
+++ ktalkd/ktalkd/machines/Makefile.in
-@@ -145,6 +145,7 @@
+@@ -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@
-@@ -241,6 +242,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -243,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85891,7 +89106,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -284,6 +288,7 @@
+@@ -290,6 +294,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85899,7 +89114,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -295,12 +300,9 @@
+@@ -301,12 +306,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85912,9 +89127,9 @@
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@
+@@ -327,10 +329,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -85926,7 +89141,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -331,6 +336,7 @@
+@@ -339,6 +344,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85934,7 +89149,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -407,12 +413,15 @@
+@@ -419,12 +425,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85950,7 +89165,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -442,7 +451,7 @@
+@@ -454,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -85959,7 +89174,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +489,9 @@
+@@ -492,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85973,15 +89188,15 @@
clean-noinstLIBRARIES:
--- ktalkd/ktalkd/Makefile.in
+++ ktalkd/ktalkd/Makefile.in
-@@ -168,6 +168,7 @@
+@@ -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@
-@@ -264,6 +265,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -266,6 +267,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85991,7 +89206,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -307,6 +311,7 @@
+@@ -313,6 +317,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85999,7 +89214,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -318,12 +323,9 @@
+@@ -324,12 +329,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86012,9 +89227,9 @@
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@
+@@ -350,10 +352,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86026,7 +89241,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -354,6 +359,7 @@
+@@ -362,6 +367,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86034,7 +89249,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -430,12 +436,15 @@
+@@ -442,12 +448,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86050,7 +89265,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -484,7 +493,7 @@
+@@ -496,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -86059,7 +89274,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +531,9 @@
+@@ -534,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86071,7 +89286,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -922,7 +931,7 @@
+@@ -934,7 +943,7 @@
.NOEXPORT:
#>+ 2
@@ -86082,15 +89297,15 @@
docs-am:
--- ktalkd/ktalkdlg/Makefile.in
+++ ktalkd/ktalkdlg/Makefile.in
-@@ -136,6 +136,7 @@
+@@ -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@
-@@ -232,6 +233,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -234,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86100,7 +89315,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -275,6 +279,7 @@
+@@ -281,6 +285,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86108,7 +89323,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -286,12 +291,9 @@
+@@ -292,12 +297,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86121,9 +89336,9 @@
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@
+@@ -318,10 +320,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86135,7 +89350,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -322,6 +327,7 @@
+@@ -330,6 +335,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86143,7 +89358,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -398,12 +404,15 @@
+@@ -410,12 +416,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86159,7 +89374,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -434,7 +443,7 @@
+@@ -446,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86168,7 +89383,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +481,9 @@
+@@ -484,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86182,15 +89397,15 @@
@$(NORMAL_INSTALL)
--- ktalkd/mail.local/Makefile.in
+++ ktalkd/mail.local/Makefile.in
-@@ -130,6 +130,7 @@
+@@ -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@
-@@ -226,6 +227,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -228,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86200,7 +89415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -269,6 +273,7 @@
+@@ -275,6 +279,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86208,7 +89423,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -280,12 +285,9 @@
+@@ -286,12 +291,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86221,9 +89436,9 @@
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@
+@@ -312,10 +314,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86235,7 +89450,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -316,6 +321,7 @@
+@@ -324,6 +329,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86243,7 +89458,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -392,12 +398,15 @@
+@@ -404,12 +410,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86259,7 +89474,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -426,7 +435,7 @@
+@@ -438,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -86268,7 +89483,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +473,9 @@
+@@ -476,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86282,15 +89497,15 @@
@$(NORMAL_INSTALL)
--- ktalkd/Makefile.in
+++ ktalkd/Makefile.in
-@@ -119,6 +119,7 @@
+@@ -122,6 +122,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -217,6 +218,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86300,7 +89515,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -258,6 +262,7 @@
+@@ -264,6 +268,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86308,7 +89523,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -269,12 +274,9 @@
+@@ -275,12 +280,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86321,9 +89536,9 @@
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@
+@@ -301,10 +303,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86335,7 +89550,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -305,6 +310,7 @@
+@@ -313,6 +318,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86343,7 +89558,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -381,12 +387,15 @@
+@@ -393,12 +399,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86359,7 +89574,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -414,7 +423,7 @@
+@@ -426,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -86368,7 +89583,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +461,9 @@
+@@ -464,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86382,15 +89597,15 @@
mostlyclean-libtool:
--- lanbrowsing/kcmlisa/Makefile.in
+++ lanbrowsing/kcmlisa/Makefile.in
-@@ -160,6 +160,7 @@
+@@ -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@
-@@ -256,6 +257,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -258,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86400,7 +89615,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -299,6 +303,7 @@
+@@ -305,6 +309,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86408,7 +89623,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -310,12 +315,9 @@
+@@ -316,12 +321,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86421,9 +89636,9 @@
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@
+@@ -342,10 +344,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86435,7 +89650,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -346,6 +351,7 @@
+@@ -354,6 +359,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86443,7 +89658,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -422,12 +428,15 @@
+@@ -434,12 +440,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86459,7 +89674,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -462,7 +471,7 @@
+@@ -474,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86468,7 +89683,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +509,9 @@
+@@ -512,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86480,7 +89695,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -901,18 +910,18 @@
+@@ -913,18 +922,18 @@
#>+ 3
@@ -86505,7 +89720,7 @@
#>+ 3
kcmkiolan.moc: $(srcdir)/kcmkiolan.h
-@@ -937,7 +946,7 @@
+@@ -949,7 +958,7 @@
#>+ 3
clean-metasources:
@@ -86514,7 +89729,7 @@
#>+ 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 +997,7 @@
+@@ -1000,7 +1009,7 @@
#>+ 11
@@ -86525,15 +89740,15 @@
echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
--- lanbrowsing/kio_lan/Makefile.in
+++ lanbrowsing/kio_lan/Makefile.in
-@@ -151,6 +151,7 @@
+@@ -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@
-@@ -247,6 +248,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -249,6 +250,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86543,7 +89758,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +294,7 @@
+@@ -296,6 +300,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86551,7 +89766,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -301,12 +306,9 @@
+@@ -307,12 +312,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86564,9 +89779,9 @@
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@
+@@ -333,10 +335,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86578,7 +89793,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -337,6 +342,7 @@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86586,7 +89801,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -413,12 +419,15 @@
+@@ -425,12 +431,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86602,7 +89817,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -463,7 +472,7 @@
+@@ -475,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86611,7 +89826,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +510,9 @@
+@@ -513,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86625,15 +89840,15 @@
@$(NORMAL_INSTALL)
--- lanbrowsing/lisa/Makefile.in
+++ lanbrowsing/lisa/Makefile.in
-@@ -163,6 +163,7 @@
+@@ -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@
-@@ -259,6 +260,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -261,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86643,7 +89858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -302,6 +306,7 @@
+@@ -308,6 +312,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86651,7 +89866,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -313,12 +318,9 @@
+@@ -319,12 +324,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86664,9 +89879,9 @@
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@
+@@ -345,10 +347,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86678,7 +89893,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -349,6 +354,7 @@
+@@ -357,6 +362,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86686,7 +89901,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -425,12 +431,15 @@
+@@ -437,12 +443,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86702,7 +89917,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -488,7 +497,7 @@
+@@ -500,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86711,7 +89926,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +535,9 @@
+@@ -538,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86725,15 +89940,15 @@
@$(NORMAL_INSTALL)
--- lanbrowsing/Makefile.in
+++ lanbrowsing/Makefile.in
-@@ -116,6 +116,7 @@
+@@ -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@
-@@ -212,6 +213,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -214,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86743,7 +89958,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -255,6 +259,7 @@
+@@ -261,6 +265,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86751,7 +89966,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -266,12 +271,9 @@
+@@ -272,12 +277,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86764,9 +89979,9 @@
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@
+@@ -298,10 +300,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86778,7 +89993,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -302,6 +307,7 @@
+@@ -310,6 +315,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86786,7 +90001,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -378,12 +384,15 @@
+@@ -390,12 +396,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86802,7 +90017,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -409,7 +418,7 @@
+@@ -421,7 +430,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -86811,7 +90026,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +456,9 @@
+@@ -459,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86825,15 +90040,15 @@
mostlyclean-libtool:
--- librss/Makefile.in
+++ librss/Makefile.in
-@@ -155,6 +155,7 @@
+@@ -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@
-@@ -251,6 +252,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -253,6 +254,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86843,7 +90058,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -294,6 +298,7 @@
+@@ -300,6 +304,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86851,7 +90066,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -305,12 +310,9 @@
+@@ -311,12 +316,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86864,9 +90079,9 @@
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@
+@@ -337,10 +339,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86878,7 +90093,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -341,6 +346,7 @@
+@@ -349,6 +354,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86886,7 +90101,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -417,12 +423,15 @@
+@@ -429,12 +435,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -86902,7 +90117,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -465,7 +474,7 @@
+@@ -477,7 +486,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -86911,7 +90126,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +512,9 @@
+@@ -515,9 +524,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86923,7 +90138,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -829,7 +838,7 @@
+@@ -841,7 +850,7 @@
-rm -f loader.moc image.moc testlibrss.moc
#>+ 2
@@ -86934,15 +90149,15 @@
clean-closures:
--- Makefile.in
+++ Makefile.in
-@@ -134,6 +134,7 @@
+@@ -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@
-@@ -230,6 +231,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -232,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -86952,7 +90167,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -273,6 +277,7 @@
+@@ -279,6 +283,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -86960,7 +90175,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -284,12 +289,9 @@
+@@ -290,12 +295,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -86973,9 +90188,9 @@
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@
+@@ -316,10 +318,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -86987,7 +90202,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -320,6 +325,7 @@
+@@ -328,6 +333,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -86995,7 +90210,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -396,12 +402,15 @@
+@@ -408,12 +414,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -87011,7 +90226,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -435,7 +444,7 @@
+@@ -447,7 +456,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -87020,7 +90235,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,12 +486,12 @@
+@@ -489,12 +498,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -87035,7 +90250,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -494,7 +503,7 @@
+@@ -506,7 +515,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -87044,26 +90259,26 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -1004,7 +1013,7 @@
+@@ -1016,7 +1025,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=Mainpage.dox COPYING-DOCS 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 COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
--- wifi/kcmwifi/Makefile.in
+++ wifi/kcmwifi/Makefile.in
-@@ -151,6 +151,7 @@
+@@ -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@
-@@ -247,6 +248,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -249,6 +250,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87073,7 +90288,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -290,6 +294,7 @@
+@@ -296,6 +300,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -87081,7 +90296,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -301,12 +306,9 @@
+@@ -307,12 +312,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -87094,9 +90309,9 @@
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@
+@@ -333,10 +335,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -87108,7 +90323,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -337,6 +342,7 @@
+@@ -345,6 +350,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -87116,7 +90331,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -413,12 +419,15 @@
+@@ -425,12 +431,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -87132,7 +90347,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -461,7 +470,7 @@
+@@ -473,7 +482,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -87141,7 +90356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +508,9 @@
+@@ -511,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87153,7 +90368,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -801,18 +810,18 @@
+@@ -813,18 +822,18 @@
mocs: mainconfig.moc
#>+ 3
@@ -87178,7 +90393,7 @@
#>+ 3
wificonfig.moc: $(srcdir)/wificonfig.h
-@@ -823,7 +832,7 @@
+@@ -835,7 +844,7 @@
#>+ 3
clean-metasources:
@@ -87187,7 +90402,7 @@
#>+ 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 +891,7 @@
+@@ -894,7 +903,7 @@
#>+ 11
@@ -87198,15 +90413,15 @@
echo "#define KDE_USE_FINAL 1" >> kcm_wifi_la.all_cpp.final; \
--- wifi/kwireless/Makefile.in
+++ wifi/kwireless/Makefile.in
-@@ -147,6 +147,7 @@
+@@ -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@
-@@ -243,6 +244,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -245,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87216,7 +90431,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -286,6 +290,7 @@
+@@ -292,6 +296,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -87224,7 +90439,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -297,12 +302,9 @@
+@@ -303,12 +308,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -87237,9 +90452,9 @@
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@
+@@ -329,10 +331,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -87251,7 +90466,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -333,6 +338,7 @@
+@@ -341,6 +346,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -87259,7 +90474,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -409,12 +415,15 @@
+@@ -421,12 +427,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -87275,7 +90490,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -457,7 +466,7 @@
+@@ -469,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -87284,7 +90499,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -495,9 +504,9 @@
+@@ -507,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87298,15 +90513,15 @@
@$(NORMAL_INSTALL)
--- wifi/locations/Makefile.in
+++ wifi/locations/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87316,7 +90531,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -87324,7 +90539,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -87337,9 +90552,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -87351,7 +90566,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -87359,7 +90574,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -87375,7 +90590,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -407,7 +416,7 @@
+@@ -419,7 +428,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87384,7 +90599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +454,9 @@
+@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87398,15 +90613,15 @@
mostlyclean-libtool:
--- wifi/Makefile.in
+++ wifi/Makefile.in
-@@ -178,6 +178,7 @@
+@@ -181,6 +181,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 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -276,6 +277,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87416,7 +90631,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -323,6 +327,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -87424,7 +90639,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -328,12 +333,9 @@
+@@ -334,12 +339,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -87437,9 +90652,9 @@
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@
+@@ -360,10 +362,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -87451,7 +90666,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -364,6 +369,7 @@
+@@ -372,6 +377,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -87459,7 +90674,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -440,12 +446,15 @@
+@@ -452,12 +458,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -87475,7 +90690,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -523,7 +532,7 @@
+@@ -535,7 +544,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -87484,7 +90699,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +570,9 @@
+@@ -573,9 +582,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87496,7 +90711,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -979,18 +988,18 @@
+@@ -991,18 +1000,18 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub interface_dcop.kidl
#>+ 3
@@ -87521,7 +90736,7 @@
#>+ 3
interface_wireless.moc: $(srcdir)/interface_wireless.h
-@@ -1015,7 +1024,7 @@
+@@ -1027,7 +1036,7 @@
#>+ 3
clean-metasources:
@@ -87530,7 +90745,7 @@
#>+ 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 +1039,29 @@
+@@ -1042,29 +1051,29 @@
#>+ 25
install-kde-icons:
@@ -87572,7 +90787,7 @@
#>+ 15
force-reedit:
-@@ -1093,7 +1102,7 @@
+@@ -1105,7 +1114,7 @@
#>+ 11
@@ -87583,15 +90798,15 @@
echo "#define KDE_USE_FINAL 1" >> kwifimanager.all_cpp.final; \
--- wifi/pixmaps/Makefile.in
+++ wifi/pixmaps/Makefile.in
-@@ -110,6 +110,7 @@
+@@ -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@
-@@ -206,6 +207,9 @@
+ IDN_CFLAGS = @IDN_CFLAGS@
+ IDN_LIBS = @IDN_LIBS@
+@@ -208,6 +209,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -87601,7 +90816,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -249,6 +253,7 @@
+@@ -255,6 +259,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -87609,7 +90824,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -260,12 +265,9 @@
+@@ -266,12 +271,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -87622,9 +90837,9 @@
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@
+@@ -292,10 +294,13 @@
+ compile_LIBKOPETE_COMPAT_FALSE = @compile_LIBKOPETE_COMPAT_FALSE@
+ compile_LIBKOPETE_COMPAT_TRUE = @compile_LIBKOPETE_COMPAT_TRUE@
datadir = @datadir@
+datarootdir = @datarootdir@
dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
@@ -87636,7 +90851,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -296,6 +301,7 @@
+@@ -304,6 +309,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -87644,7 +90859,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -372,12 +378,15 @@
+@@ -384,12 +390,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -87660,7 +90875,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -415,7 +424,7 @@
+@@ -427,7 +436,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -87669,7 +90884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +462,9 @@
+@@ -465,9 +474,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