rev 4592 - trunk/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Oct 4 23:04:32 UTC 2006
Author: chrsmrtn
Date: 2006-10-04 23:04:22 +0000 (Wed, 04 Oct 2006)
New Revision: 4592
Modified:
trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
buildprep update.
Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff 2006-10-04 23:04:01 UTC (rev 4591)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff 2006-10-04 23:04:22 UTC (rev 4592)
@@ -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
@@ -3835,6 +3835,44 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- aclocal.m4
++++ aclocal.m4
+@@ -501,6 +501,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- applnk/compat/Makefile.in
+++ applnk/compat/Makefile.in
@@ -119,6 +119,7 @@
@@ -3940,6 +3978,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -759,7 +768,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop Makefile.am power.desktop
++KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop power.desktop Makefile.am
+
+ #>+ 2
+ docs-am:
--- applnk/Makefile.in
+++ applnk/Makefile.in
@@ -136,6 +136,7 @@
@@ -4054,6 +4101,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -1026,7 +1035,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-utilities-file.directory kde-games-arcade.directory kde-games.directory kde-settings-accessibility.directory kde-settings-security.directory kde-utilities-accessibility.directory kde-settings-network.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-toys.directory kde-system-screensavers.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-peripherals.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory
++KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-utilities-file.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-utilities-accessibility.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-development.directory kde-games-card.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory kde-graphics.directory hidden.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-utilities-peripherals.directory kde-settings.directory kde-science.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory kde-multimedia.directory Makefile.am kde-games-strategy.directory kde-settings-peripherals.directory
+
+ #>+ 2
+ docs-am:
--- config.h.in
+++ config.h.in
@@ -212,10 +212,14 @@
@@ -4112,7 +4168,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,
@@ -4802,19 +4858,53 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,525 @@
+@@ -430,42 +720,550 @@
+ # 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"
@@ -5532,15 +5622,9 @@
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-+# 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
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5550,9 +5634,15 @@
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
--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
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5956,7 +6046,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,
@@ -5975,7 +6065,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 $@
@@ -6863,9 +6953,9 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2297,16 +3193,16 @@
+@@ -2296,16 +3192,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
@@ -6886,7 +6976,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2319,13 +3215,13 @@
+@@ -2318,13 +3214,13 @@
@@ -6904,7 +6994,7 @@
val=
-@@ -2342,11 +3238,11 @@
+@@ -2341,11 +3237,11 @@
@@ -6918,7 +7008,7 @@
am_make=${MAKE-make}
-@@ -2356,8 +3252,8 @@
+@@ -2355,8 +3251,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6929,7 +7019,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2384,15 +3280,15 @@
+@@ -2383,15 +3279,15 @@
fi
@@ -6950,7 +7040,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2412,10 +3308,9 @@
+@@ -2411,10 +3307,9 @@
@@ -6963,7 +7053,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2435,18 +3330,18 @@
+@@ -2434,18 +3329,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -6989,7 +7079,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2455,12 +3350,12 @@
+@@ -2454,12 +3349,12 @@
else
kde_use_strict_options="no"
@@ -7006,7 +7096,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2469,20 +3364,21 @@
+@@ -2468,20 +3363,21 @@
else
kde_use_warnings="yes"
@@ -7033,7 +7123,7 @@
CFLAGS=" $CFLAGS"
-@@ -2494,8 +3390,8 @@
+@@ -2493,8 +3389,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
@@ -7044,7 +7134,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2508,32 +3404,34 @@
+@@ -2507,32 +3403,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7086,7 +7176,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2546,36 +3444,51 @@
+@@ -2545,36 +3443,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7148,7 +7238,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2588,74 +3501,34 @@
+@@ -2587,74 +3500,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7232,7 +7322,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2669,7 +3542,7 @@
+@@ -2668,7 +3541,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7241,7 +7331,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2680,6 +3553,7 @@
+@@ -2679,6 +3552,7 @@
fi
done
done
@@ -7249,7 +7339,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2697,22 +3571,23 @@
+@@ -2696,22 +3570,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7280,7 +7370,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2725,36 +3600,38 @@
+@@ -2724,36 +3599,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7327,7 +7417,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2767,29 +3644,45 @@
+@@ -2766,29 +3643,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7379,7 +7469,7 @@
fi
fi
-@@ -2802,21 +3695,35 @@
+@@ -2801,21 +3694,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7423,7 +7513,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2841,46 +3748,70 @@
+@@ -2840,47 +3747,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.
@@ -7477,7 +7567,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
@@ -7514,16 +7604,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
-@@ -2893,19 +3824,23 @@
+
+@@ -2892,19 +3829,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
@@ -7547,7 +7642,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2924,22 +3859,27 @@
+@@ -2923,22 +3862,27 @@
fi
fi
fi
@@ -7587,7 +7682,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2950,9 +3890,8 @@
+@@ -2949,9 +3893,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7598,7 +7693,7 @@
break;;
* ) break;;
esac
-@@ -2966,14 +3905,14 @@
+@@ -2965,14 +3908,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7617,7 +7712,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2993,14 +3932,20 @@
+@@ -2992,14 +3935,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7642,7 +7737,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3018,12 +3963,12 @@
+@@ -3017,12 +3966,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7659,7 +7754,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3046,24 +3991,36 @@
+@@ -3045,24 +3994,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7704,7 +7799,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3072,24 +4029,28 @@
+@@ -3071,24 +4032,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7741,7 +7836,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3105,24 +4066,36 @@
+@@ -3104,24 +4069,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7786,7 +7881,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3131,285 +4104,278 @@
+@@ -3130,285 +4107,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8249,7 +8344,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3418,8 +4384,8 @@
+@@ -3417,8 +4387,8 @@
depcc="$CC" am_compiler_list=
@@ -8260,7 +8355,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3508,8 +4474,8 @@
+@@ -3507,8 +4477,8 @@
fi
fi
@@ -8271,7 +8366,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3531,8 +4497,8 @@
+@@ -3530,8 +4500,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
@@ -8282,7 +8377,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3566,8 +4532,13 @@
+@@ -3565,8 +4535,13 @@
#endif
Syntax error
_ACEOF
@@ -8298,7 +8393,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3592,9 +4563,10 @@
+@@ -3591,9 +4566,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8310,7 +8405,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3604,8 +4576,13 @@
+@@ -3603,8 +4579,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8326,7 +8421,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3632,6 +4609,7 @@
+@@ -3631,6 +4612,7 @@
ac_preproc_ok=:
break
fi
@@ -8334,7 +8429,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3649,8 +4627,8 @@
+@@ -3648,8 +4630,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8345,7 +8440,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3673,8 +4651,13 @@
+@@ -3672,8 +4654,13 @@
#endif
Syntax error
_ACEOF
@@ -8361,7 +8456,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3699,9 +4682,10 @@
+@@ -3698,9 +4685,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8373,7 +8468,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3711,8 +4695,13 @@
+@@ -3710,8 +4698,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8389,7 +8484,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3739,6 +4728,7 @@
+@@ -3738,6 +4731,7 @@
ac_preproc_ok=:
break
fi
@@ -8397,7 +8492,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3789,18 +4779,22 @@
+@@ -3788,18 +4782,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8425,7 +8520,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3813,36 +4807,38 @@
+@@ -3812,36 +4810,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8472,7 +8567,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3855,55 +4851,85 @@
+@@ -3854,55 +4854,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8576,7 +8671,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3926,24 +4952,36 @@
+@@ -3925,24 +4955,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8621,7 +8716,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3952,24 +4990,28 @@
+@@ -3951,24 +4993,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8658,7 +8753,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3985,24 +5027,36 @@
+@@ -3984,24 +5030,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8703,7 +8798,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4011,70 +5065,53 @@
+@@ -4010,70 +5068,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8798,7 +8893,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4083,61 +5120,91 @@
+@@ -4082,61 +5123,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8884,12 +8979,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
@@ -8912,7 +9007,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4146,8 +5213,8 @@
+@@ -4145,8 +5216,8 @@
depcc="$CXX" am_compiler_list=
@@ -8923,7 +9018,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4236,8 +5303,8 @@
+@@ -4235,8 +5306,8 @@
fi
fi
@@ -8934,7 +9029,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4255,8 +5322,8 @@
+@@ -4254,8 +5325,8 @@
@@ -8945,7 +9040,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4281,24 +5348,36 @@
+@@ -4280,24 +5351,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8990,7 +9085,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4307,13 +5386,14 @@
+@@ -4306,13 +5389,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9009,7 +9104,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4355,17 +5435,16 @@
+@@ -4354,17 +5438,16 @@
fi
fi
@@ -9031,7 +9126,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'
-@@ -4393,24 +5472,36 @@
+@@ -4392,24 +5475,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9076,7 +9171,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4419,8 +5510,10 @@
+@@ -4418,8 +5513,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9084,11 +9179,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
-@@ -4433,29 +5526,28 @@
+@@ -4432,29 +5529,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9126,7 +9221,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'
-@@ -4482,24 +5574,36 @@
+@@ -4481,24 +5577,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9171,7 +9266,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4508,8 +5612,10 @@
+@@ -4507,8 +5615,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9179,11 +9274,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
-@@ -4522,13 +5628,13 @@
+@@ -4521,13 +5631,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9201,7 +9296,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4549,16 +5655,15 @@
+@@ -4548,16 +5658,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9222,7 +9317,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'
-@@ -4585,24 +5690,36 @@
+@@ -4584,24 +5693,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9267,7 +9362,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4611,8 +5728,10 @@
+@@ -4610,8 +5731,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9275,11 +9370,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
-@@ -4625,16 +5744,16 @@
+@@ -4624,16 +5747,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9300,7 +9395,7 @@
:
fi
-@@ -4649,16 +5768,15 @@
+@@ -4648,16 +5771,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"
@@ -9321,7 +9416,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'
-@@ -4685,24 +5803,36 @@
+@@ -4684,24 +5806,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9366,7 +9461,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4711,8 +5841,10 @@
+@@ -4710,8 +5844,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9374,11 +9469,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
-@@ -4725,27 +5857,26 @@
+@@ -4724,27 +5860,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9413,7 +9508,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4770,24 +5901,36 @@
+@@ -4769,24 +5904,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9458,7 +9553,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4796,8 +5939,10 @@
+@@ -4795,8 +5942,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9466,11 +9561,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
-@@ -4810,13 +5955,13 @@
+@@ -4809,13 +5958,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9488,7 +9583,7 @@
:
fi
-@@ -4824,16 +5969,15 @@
+@@ -4823,16 +5972,15 @@
;;
esac
@@ -9509,7 +9604,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'
-@@ -4860,24 +6004,36 @@
+@@ -4859,24 +6007,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9554,7 +9649,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4886,8 +6042,10 @@
+@@ -4885,8 +6045,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9562,11 +9657,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
-@@ -4900,28 +6058,27 @@
+@@ -4899,28 +6061,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9603,7 +9698,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'
-@@ -4948,24 +6105,36 @@
+@@ -4947,24 +6108,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9648,7 +9743,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4974,8 +6143,10 @@
+@@ -4973,8 +6146,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9656,11 +9751,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
-@@ -4988,28 +6159,27 @@
+@@ -4987,28 +6162,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9697,7 +9792,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'
-@@ -5036,24 +6206,36 @@
+@@ -5035,24 +6209,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9742,7 +9837,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5062,8 +6244,10 @@
+@@ -5061,8 +6247,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9750,11 +9845,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
-@@ -5076,13 +6260,13 @@
+@@ -5075,13 +6263,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9772,7 +9867,7 @@
:
fi
-@@ -5094,13 +6278,13 @@
+@@ -5093,13 +6281,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9790,7 +9885,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5108,16 +6292,15 @@
+@@ -5107,16 +6295,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9811,7 +9906,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'
-@@ -5144,24 +6327,36 @@
+@@ -5143,24 +6330,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9856,7 +9951,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5170,8 +6365,10 @@
+@@ -5169,8 +6368,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9864,11 +9959,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
-@@ -5184,13 +6381,13 @@
+@@ -5183,13 +6384,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9886,7 +9981,7 @@
:
fi
-@@ -5202,16 +6399,15 @@
+@@ -5201,16 +6402,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9907,7 +10002,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'
-@@ -5238,24 +6434,36 @@
+@@ -5237,24 +6437,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9952,7 +10047,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5264,8 +6472,10 @@
+@@ -5263,8 +6475,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9960,11 +10055,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
-@@ -5278,28 +6488,27 @@
+@@ -5277,28 +6491,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10001,7 +10096,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'
-@@ -5326,24 +6535,36 @@
+@@ -5325,24 +6538,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10046,7 +10141,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5352,8 +6573,10 @@
+@@ -5351,8 +6576,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10054,11 +10149,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
-@@ -5366,28 +6589,27 @@
+@@ -5365,28 +6592,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10095,7 +10190,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'
-@@ -5414,24 +6636,36 @@
+@@ -5413,24 +6639,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10140,7 +10235,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5440,8 +6674,10 @@
+@@ -5439,8 +6677,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10148,11 +10243,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
-@@ -5454,28 +6690,27 @@
+@@ -5453,28 +6693,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10189,7 +10284,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'
-@@ -5502,24 +6737,36 @@
+@@ -5501,24 +6740,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10234,7 +10329,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5528,8 +6775,10 @@
+@@ -5527,8 +6778,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10242,11 +10337,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
-@@ -5542,13 +6791,13 @@
+@@ -5541,13 +6794,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10264,7 +10359,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5556,37 +6805,37 @@
+@@ -5555,37 +6808,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10316,7 +10411,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5618,24 +6867,36 @@
+@@ -5617,24 +6870,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10361,7 +10456,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5644,18 +6905,19 @@
+@@ -5643,18 +6908,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10371,7 +10466,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"
@@ -10385,7 +10480,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5675,16 +6937,15 @@
+@@ -5674,16 +6940,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10406,7 +10501,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'
-@@ -5711,24 +6972,36 @@
+@@ -5710,24 +6975,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10451,7 +10546,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5737,8 +7010,10 @@
+@@ -5736,8 +7013,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10459,11 +10554,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
-@@ -5751,29 +7026,28 @@
+@@ -5750,29 +7029,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10501,7 +10596,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'
-@@ -5800,24 +7074,36 @@
+@@ -5799,24 +7077,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10546,7 +10641,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5826,8 +7112,10 @@
+@@ -5825,8 +7115,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10554,11 +10649,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
-@@ -5840,28 +7128,27 @@
+@@ -5839,28 +7131,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10595,7 +10690,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'
-@@ -5888,24 +7175,36 @@
+@@ -5887,24 +7178,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10640,7 +10735,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5914,8 +7213,10 @@
+@@ -5913,8 +7216,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10648,11 +10743,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
-@@ -5928,28 +7229,27 @@
+@@ -5927,28 +7232,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10689,7 +10784,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'
-@@ -5976,24 +7276,36 @@
+@@ -5975,24 +7279,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10734,7 +10829,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6002,8 +7314,10 @@
+@@ -6001,8 +7317,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10742,11 +10837,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
-@@ -6016,28 +7330,27 @@
+@@ -6015,28 +7333,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10783,7 +10878,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'
-@@ -6064,24 +7377,36 @@
+@@ -6063,24 +7380,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10828,7 +10923,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6090,8 +7415,10 @@
+@@ -6089,8 +7418,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10836,11 +10931,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
-@@ -6104,28 +7431,27 @@
+@@ -6103,28 +7434,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10877,7 +10972,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'
-@@ -6152,24 +7478,36 @@
+@@ -6151,24 +7481,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10922,7 +11017,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6178,8 +7516,10 @@
+@@ -6177,8 +7519,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10930,11 +11025,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
-@@ -6192,13 +7532,13 @@
+@@ -6191,13 +7535,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10952,7 +11047,7 @@
:
fi
-@@ -6305,13 +7645,13 @@
+@@ -6304,13 +7648,13 @@
fi
@@ -10969,7 +11064,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6341,8 +7681,13 @@
+@@ -6340,8 +7684,13 @@
#endif
Syntax error
_ACEOF
@@ -10985,7 +11080,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6367,9 +7712,10 @@
+@@ -6366,9 +7715,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10997,7 +11092,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6379,8 +7725,13 @@
+@@ -6378,8 +7728,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11013,7 +11108,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6407,6 +7758,7 @@
+@@ -6406,6 +7761,7 @@
ac_preproc_ok=:
break
fi
@@ -11021,7 +11116,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6424,8 +7776,8 @@
+@@ -6423,8 +7779,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -11032,7 +11127,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6448,8 +7800,13 @@
+@@ -6447,8 +7803,13 @@
#endif
Syntax error
_ACEOF
@@ -11048,7 +11143,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6474,9 +7831,10 @@
+@@ -6473,9 +7834,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11060,7 +11155,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6486,8 +7844,13 @@
+@@ -6485,8 +7847,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11076,7 +11171,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6514,6 +7877,7 @@
+@@ -6513,6 +7880,7 @@
ac_preproc_ok=:
break
fi
@@ -11084,7 +11179,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6540,16 +7904,15 @@
+@@ -6539,16 +7907,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11105,7 +11200,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'
-@@ -6576,24 +7939,36 @@
+@@ -6575,24 +7942,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11150,7 +11245,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6602,8 +7977,10 @@
+@@ -6601,8 +7980,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11158,11 +11253,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
-@@ -6616,22 +7993,21 @@
+@@ -6615,22 +7996,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11191,7 +11286,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6647,36 +8023,36 @@
+@@ -6646,36 +8026,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11238,7 +11333,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'
-@@ -6703,24 +8079,36 @@
+@@ -6702,24 +8082,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11283,7 +11378,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6729,8 +8117,10 @@
+@@ -6728,8 +8120,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11291,11 +11386,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
-@@ -6743,29 +8133,28 @@
+@@ -6742,29 +8136,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11333,7 +11428,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'
-@@ -6792,24 +8181,36 @@
+@@ -6791,24 +8184,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11378,7 +11473,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6818,8 +8219,10 @@
+@@ -6817,8 +8222,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11386,11 +11481,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
-@@ -6832,13 +8235,13 @@
+@@ -6831,13 +8238,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11408,7 +11503,7 @@
:
fi
-@@ -6848,13 +8251,13 @@
+@@ -6847,13 +8254,13 @@
@@ -11426,7 +11521,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6867,13 +8270,13 @@
+@@ -6866,13 +8273,13 @@
@@ -11444,7 +11539,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6884,216 +8287,36 @@
+@@ -6883,216 +8290,36 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11484,8 +11579,8 @@
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
+-
+-
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -11665,12 +11760,12 @@
- KDE_USE_NMCHECK_TRUE="#"
- KDE_USE_NMCHECK_FALSE=""
- fi
--
+
+
-
-
--
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -11680,15 +11775,15 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7112,12 +8335,12 @@
+@@ -7111,12 +8338,12 @@
esac
else
enable_shared=yes
-fi;
+fi
++
-# Check whether --enable-static or --disable-static was given.
-+
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
@@ -11697,7 +11792,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7136,7 +8359,8 @@
+@@ -7135,18 +8362,19 @@
esac
else
enable_static=no
@@ -11707,23 +11802,22 @@
-@@ -7145,11 +8369,11 @@
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
+
- # Check whether --enable-libsuffix or --disable-libsuffix was given.
+ # Check whether --enable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+ kdelibsuff="auto"
-fi;
-+ enableval=$enable_libsuffix; kdelibsuff=$enableval
+fi
+
if test "$kdelibsuff" = "auto"; then
-@@ -7170,8 +8394,8 @@
+@@ -7167,8 +8395,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11734,7 +11828,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7187,14 +8411,13 @@
+@@ -7184,14 +8412,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11753,22 +11847,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7213,10 +8436,11 @@
+@@ -7210,10 +8437,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
-@@ -7240,7 +8464,7 @@
+@@ -7237,7 +8465,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
@@ -11777,7 +11871,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7269,37 +8493,184 @@
+@@ -7266,37 +8494,184 @@
fi
SED=$lt_cv_path_SED
@@ -11857,22 +11951,25 @@
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+-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
+
-+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_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
-+ 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'
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -11880,11 +11977,8 @@
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if 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
+ 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
@@ -11940,25 +12034,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
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
++fi
++
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+
+ 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
+{ 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"
@@ -11979,7 +12073,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7328,11 +8699,11 @@
+@@ -7325,11 +8700,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11995,7 +12089,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7345,7 +8716,7 @@
+@@ -7342,7 +8717,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,
@@ -12004,7 +12098,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'*)
-@@ -7365,21 +8736,21 @@
+@@ -7362,21 +8737,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12033,7 +12127,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7389,29 +8760,38 @@
+@@ -7386,29 +8761,38 @@
;;
esac
fi
@@ -12080,7 +12174,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7419,56 +8799,63 @@
+@@ -7416,56 +8800,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12178,7 +12272,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7495,44 +8882,36 @@
+@@ -7492,44 +8883,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12233,7 +12327,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7548,7 +8927,7 @@
+@@ -7545,7 +8928,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12242,7 +12336,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
-@@ -7564,43 +8943,27 @@
+@@ -7561,43 +8944,27 @@
esac
;;
@@ -12299,7 +12393,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
-@@ -7619,32 +8982,22 @@
+@@ -7616,32 +8983,22 @@
;;
openbsd*)
@@ -12335,7 +12429,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]'
-@@ -7665,17 +9018,20 @@
+@@ -7662,17 +9019,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12359,7 +12453,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
-@@ -7684,14 +9040,17 @@
+@@ -7681,14 +9041,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12380,16 +12474,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7718,7 +9077,7 @@
+@@ -7715,7 +9078,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7721 "configure"' > conftest.$ac_ext
-+ echo '#line 9080 "configure"' > conftest.$ac_ext
+- echo '#line 7718 "configure"' > conftest.$ac_ext
++ echo '#line 9081 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7761,14 +9120,13 @@
+@@ -7758,14 +9121,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12406,7 +12500,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7780,7 +9138,6 @@
+@@ -7777,7 +9139,6 @@
esac
;;
*64-bit*)
@@ -12414,7 +12508,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7805,8 +9162,8 @@
+@@ -7802,8 +9163,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12425,7 +12519,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7832,24 +9189,36 @@
+@@ -7829,24 +9190,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12470,7 +12564,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7858,9 +9227,10 @@
+@@ -7855,9 +9228,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12479,11 +12573,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'
-@@ -7869,13 +9239,33 @@
+@@ -7866,13 +9240,33 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12519,7 +12613,7 @@
esac
-@@ -7883,8 +9273,8 @@
+@@ -7880,8 +9274,8 @@
@@ -12530,7 +12624,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7908,24 +9298,36 @@
+@@ -7905,24 +9299,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12575,7 +12669,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7934,9 +9336,10 @@
+@@ -7931,9 +9337,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12588,7 +12682,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7992,6 +9395,7 @@
+@@ -7989,6 +9396,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12596,7 +12690,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -8011,18 +9415,27 @@
+@@ -8008,18 +9416,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12630,7 +12724,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8035,12 +9448,14 @@
+@@ -8032,12 +9449,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12648,7 +12742,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8063,9 +9478,9 @@
+@@ -8060,9 +9479,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12661,7 +12755,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8079,24 +9494,36 @@
+@@ -8076,24 +9495,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12706,7 +12800,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8105,12 +9532,14 @@
+@@ -8102,12 +9533,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12725,7 +12819,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8125,18 +9554,19 @@
+@@ -8122,18 +9555,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12753,7 +12847,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8147,24 +9577,36 @@
+@@ -8144,24 +9578,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12798,7 +12892,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8173,15 +9615,16 @@
+@@ -8170,15 +9616,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12821,7 +12915,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8190,8 +9633,13 @@
+@@ -8187,8 +9634,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12837,7 +12931,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8215,9 +9663,10 @@
+@@ -8212,9 +9664,10 @@
ac_header_preproc=no
fi
@@ -12850,7 +12944,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8241,25 +9690,19 @@
+@@ -8238,25 +9691,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;}
@@ -12883,7 +12977,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8271,222 +9714,541 @@
+@@ -8268,219 +9715,538 @@
done
@@ -12996,7 +13090,7 @@
-
-
-# Provide some information about the compiler.
--echo "$as_me:8366:" \
+-echo "$as_me:8363:" \
- "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
@@ -13187,9 +13281,6 @@
-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
-- FFLAGS=$ac_save_FFLAGS
--elif test $ac_cv_prog_f77_g = yes; then
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -13603,13 +13694,10 @@
+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
-+ FFLAGS=$ac_save_FFLAGS
-+elif test $ac_cv_prog_f77_g = yes; then
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-g -O2"
- else
-@@ -8512,13 +10274,13 @@
+ if test "$ac_test_FFLAGS" = set; then
+ FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8509,13 +10275,13 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -13626,7 +13714,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8547,20 +10309,70 @@
+@@ -8544,20 +10310,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -13703,7 +13791,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.
-@@ -8571,19 +10383,19 @@
+@@ -8568,19 +10384,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13729,7 +13817,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8597,9 +10409,6 @@
+@@ -8594,9 +10410,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -13739,7 +13827,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'"
-@@ -8621,14 +10430,30 @@
+@@ -8618,14 +10431,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'"
;;
@@ -13772,7 +13860,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8646,14 +10471,17 @@
+@@ -8643,14 +10472,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13792,7 +13880,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8771,15 +10599,15 @@
+@@ -8768,15 +10600,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
@@ -13814,7 +13902,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8793,8 +10621,8 @@
+@@ -8790,8 +10622,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13825,7 +13913,7 @@
objdir=$lt_cv_objdir
-@@ -8815,7 +10643,7 @@
+@@ -8812,7 +10644,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13834,7 +13922,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8835,7 +10663,7 @@
+@@ -8832,7 +10664,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13843,7 +13931,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8845,8 +10673,8 @@
+@@ -8842,8 +10674,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
@@ -13854,7 +13942,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8859,32 +10687,34 @@
+@@ -8856,32 +10688,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13896,7 +13984,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8897,27 +10727,41 @@
+@@ -8894,27 +10728,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13945,7 +14033,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8925,8 +10769,8 @@
+@@ -8922,8 +10770,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
@@ -13956,7 +14044,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8939,32 +10783,34 @@
+@@ -8936,32 +10784,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13998,7 +14086,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8977,27 +10823,41 @@
+@@ -8974,27 +10824,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14047,7 +14135,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -9005,8 +10865,8 @@
+@@ -9002,8 +10866,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
@@ -14058,7 +14146,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9019,32 +10879,34 @@
+@@ -9016,32 +10880,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14100,7 +14188,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9057,27 +10919,41 @@
+@@ -9054,27 +10920,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14149,7 +14237,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9092,6 +10968,7 @@
+@@ -9089,6 +10969,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -14157,7 +14245,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9111,21 +10988,32 @@
+@@ -9108,21 +10989,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -14194,7 +14282,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9145,7 +11033,7 @@
+@@ -9142,7 +11034,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14203,7 +14291,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
-@@ -9177,17 +11065,17 @@
+@@ -9174,17 +11066,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14227,7 +14315,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9207,7 +11095,7 @@
+@@ -9204,7 +11096,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14236,7 +14324,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
-@@ -9239,11 +11127,11 @@
+@@ -9236,11 +11128,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14252,7 +14340,7 @@
fi
else
-@@ -9258,21 +11146,21 @@
+@@ -9255,21 +11147,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -14281,7 +14369,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9302,68 +11190,25 @@
+@@ -9299,68 +11191,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14365,7 +14453,7 @@
## CAVEAT EMPTOR:
-@@ -9377,8 +11222,8 @@
+@@ -9374,8 +11223,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14376,7 +14464,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9392,26 +11237,28 @@
+@@ -9389,26 +11238,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 \
@@ -14384,13 +14472,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:9398: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11243: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9395: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11244: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9402: \$? = $ac_status" >&5
-+ echo "$as_me:11247: \$? = $ac_status" >&5
+- echo "$as_me:9399: \$? = $ac_status" >&5
++ echo "$as_me:11248: \$? = $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
@@ -14412,7 +14500,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"
-@@ -9425,8 +11272,8 @@
+@@ -9422,8 +11273,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14423,7 +14511,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9464,6 +11311,11 @@
+@@ -9461,6 +11312,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14435,7 +14523,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9480,7 +11332,7 @@
+@@ -9477,7 +11333,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14444,7 +14532,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9506,6 +11358,16 @@
+@@ -9503,6 +11359,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14461,7 +14549,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9517,7 +11379,7 @@
+@@ -9514,7 +11380,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.
@@ -14470,7 +14558,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9540,13 +11402,20 @@
+@@ -9537,13 +11403,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14493,7 +14581,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9561,15 +11430,15 @@
+@@ -9558,15 +11431,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14515,7 +14603,7 @@
;;
sunos4*)
-@@ -9578,7 +11447,7 @@
+@@ -9575,7 +11448,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14524,7 +14612,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9591,6 +11460,17 @@
+@@ -9588,6 +11461,17 @@
fi
;;
@@ -14542,7 +14630,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9602,16 +11482,16 @@
+@@ -9599,16 +11483,16 @@
esac
fi
@@ -14563,7 +14651,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9625,26 +11505,28 @@
+@@ -9622,26 +11506,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 \
@@ -14571,13 +14659,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:9631: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11511: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9628: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11512: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9635: \$? = $ac_status" >&5
-+ echo "$as_me:11515: \$? = $ac_status" >&5
+- echo "$as_me:9632: \$? = $ac_status" >&5
++ echo "$as_me:11516: \$? = $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
@@ -14599,7 +14687,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9657,7 +11539,7 @@
+@@ -9654,7 +11540,7 @@
fi
fi
@@ -14608,7 +14696,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9667,8 +11549,50 @@
+@@ -9664,8 +11550,50 @@
;;
esac
@@ -14661,7 +14749,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9679,60 +11603,58 @@
+@@ -9676,60 +11604,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14682,13 +14770,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:9698: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11615: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9695: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11616: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9702: \$? = $ac_status" >&5
-+ echo "$as_me:11619: \$? = $ac_status" >&5
+- echo "$as_me:9699: \$? = $ac_status" >&5
++ echo "$as_me:11620: \$? = $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
@@ -14740,7 +14828,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;}
-@@ -9742,8 +11664,8 @@
+@@ -9739,8 +11665,8 @@
need_locks=no
fi
@@ -14751,7 +14839,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9781,6 +11703,16 @@
+@@ -9778,6 +11704,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14768,7 +14856,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9791,6 +11723,10 @@
+@@ -9788,6 +11724,10 @@
with_gnu_ld=no
fi
;;
@@ -14779,7 +14867,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9801,6 +11737,27 @@
+@@ -9798,6 +11738,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14807,7 +14895,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9838,7 +11795,7 @@
+@@ -9835,7 +11796,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14816,7 +14904,7 @@
else
ld_shlibs=no
fi
-@@ -9848,13 +11805,13 @@
+@@ -9845,13 +11806,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'
@@ -14833,7 +14921,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
-@@ -9863,23 +11820,70 @@
+@@ -9860,23 +11821,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14909,7 +14997,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9893,13 +11897,40 @@
+@@ -9890,13 +11898,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14952,7 +15040,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9909,24 +11940,19 @@
+@@ -9906,24 +11941,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14984,7 +15072,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9938,7 +11964,7 @@
+@@ -9935,7 +11965,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -14993,7 +15081,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9960,9 +11986,21 @@
+@@ -9957,9 +11987,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
@@ -15017,7 +15105,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9979,7 +12017,7 @@
+@@ -9976,7 +12018,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -15026,7 +15114,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`
-@@ -9998,8 +12036,12 @@
+@@ -9995,8 +12037,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -15039,7 +15127,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10007,22 +12049,23 @@
+@@ -10004,22 +12050,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -15070,7 +15158,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10038,24 +12081,36 @@
+@@ -10035,24 +12082,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15115,7 +15203,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10069,19 +12124,20 @@
+@@ -10066,19 +12125,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15123,7 +15211,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
@@ -15141,7 +15229,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10100,24 +12156,36 @@
+@@ -10097,24 +12157,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15186,7 +15274,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10131,8 +12199,10 @@
+@@ -10128,8 +12200,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15194,11 +15282,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
-@@ -10141,13 +12211,11 @@
+@@ -10138,13 +12212,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -15215,7 +15303,7 @@
fi
fi
;;
-@@ -10160,7 +12228,7 @@
+@@ -10157,7 +12229,7 @@
ld_shlibs=no
;;
@@ -15224,7 +15312,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10170,13 +12238,13 @@
+@@ -10167,13 +12239,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -15241,7 +15329,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.
-@@ -10186,52 +12254,52 @@
+@@ -10183,52 +12255,52 @@
;;
darwin* | rhapsody*)
@@ -15334,7 +15422,7 @@
fi
;;
-@@ -10265,8 +12333,8 @@
+@@ -10262,8 +12334,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15345,7 +15433,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10274,7 +12342,7 @@
+@@ -10271,7 +12343,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15354,7 +15442,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
-@@ -10288,47 +12356,62 @@
+@@ -10285,47 +12357,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15441,7 +15529,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10342,7 +12425,7 @@
+@@ -10339,7 +12426,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15450,7 +15538,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'
-@@ -10352,7 +12435,7 @@
+@@ -10349,7 +12436,7 @@
link_all_deplibs=yes
;;
@@ -15459,7 +15547,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10375,7 +12458,8 @@
+@@ -10372,7 +12459,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
@@ -15469,7 +15557,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10385,7 +12469,7 @@
+@@ -10382,7 +12470,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15478,7 +15566,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10396,14 +12480,14 @@
+@@ -10393,14 +12481,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15495,7 +15583,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'
-@@ -10415,13 +12499,13 @@
+@@ -10412,13 +12500,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15511,7 +15599,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10429,21 +12513,15 @@
+@@ -10426,21 +12514,15 @@
hardcode_libdir_separator=:
;;
@@ -15537,7 +15625,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'
-@@ -10452,8 +12530,18 @@
+@@ -10449,8 +12531,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15558,7 +15646,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10462,7 +12550,7 @@
+@@ -10459,7 +12551,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.
@@ -15567,7 +15655,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10510,36 +12598,45 @@
+@@ -10507,36 +12599,45 @@
fi
;;
@@ -15634,7 +15722,7 @@
;;
uts4*)
-@@ -10554,15 +12651,10 @@
+@@ -10551,15 +12652,10 @@
esac
fi
@@ -15652,7 +15740,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10580,8 +12672,8 @@
+@@ -10577,8 +12673,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.
@@ -15663,7 +15751,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10595,6 +12687,7 @@
+@@ -10592,6 +12688,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15671,7 +15759,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10617,20 +12710,20 @@
+@@ -10614,20 +12711,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15697,7 +15785,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10640,7 +12733,20 @@
+@@ -10637,7 +12734,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15719,7 +15807,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10705,7 +12811,7 @@
+@@ -10702,7 +12812,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15728,7 +15816,7 @@
;;
beos*)
-@@ -10714,7 +12820,7 @@
+@@ -10711,7 +12821,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15737,7 +15825,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10730,7 +12836,7 @@
+@@ -10727,7 +12837,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15746,7 +15834,7 @@
need_version=no
need_lib_prefix=no
-@@ -10742,7 +12848,8 @@
+@@ -10739,7 +12849,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15756,7 +15844,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10772,7 +12879,7 @@
+@@ -10769,7 +12880,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15765,7 +15853,7 @@
;;
esac
;;
-@@ -10795,7 +12902,7 @@
+@@ -10792,7 +12903,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15774,7 +15862,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"`
-@@ -10818,20 +12925,17 @@
+@@ -10815,20 +12926,17 @@
dynamic_linker=no
;;
@@ -15806,7 +15894,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10849,14 +12953,19 @@
+@@ -10846,14 +12954,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15828,7 +15916,7 @@
esac
;;
-@@ -10876,9 +12985,9 @@
+@@ -10873,9 +12986,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15840,7 +15928,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10893,7 +13002,7 @@
+@@ -10890,7 +13003,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15849,7 +15937,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10904,7 +13013,7 @@
+@@ -10901,7 +13014,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15858,7 +15946,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10916,6 +13025,18 @@
+@@ -10913,6 +13026,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15877,7 +15965,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -10959,29 +13080,26 @@
+@@ -10956,29 +13081,26 @@
;;
# This must be Linux ELF.
@@ -15914,7 +16002,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,
-@@ -10991,6 +13109,18 @@
+@@ -10988,6 +13110,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15933,7 +16021,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11000,7 +13130,7 @@
+@@ -10997,7 +13131,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15942,7 +16030,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11028,8 +13158,13 @@
+@@ -11025,8 +13159,13 @@
openbsd*)
version_type=sunos
@@ -15957,7 +16045,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
-@@ -11049,7 +13184,7 @@
+@@ -11046,7 +13185,7 @@
os2*)
libname_spec='$name'
@@ -15966,7 +16054,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11067,13 +13202,6 @@
+@@ -11064,13 +13203,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15980,7 +16068,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11099,7 +13227,7 @@
+@@ -11096,7 +13228,7 @@
need_version=yes
;;
@@ -15989,7 +16077,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'
-@@ -11132,6 +13260,29 @@
+@@ -11129,6 +13261,29 @@
fi
;;
@@ -16019,7 +16107,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11143,16 +13294,21 @@
+@@ -11140,16 +13295,21 @@
dynamic_linker=no
;;
esac
@@ -16047,7 +16135,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11172,8 +13328,8 @@
+@@ -11169,8 +13329,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -16058,7 +16146,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11186,29 +13342,29 @@
+@@ -11183,29 +13343,29 @@
striplib=
old_striplib=
@@ -16098,7 +16186,7 @@
;;
esac
fi
-@@ -11240,8 +13396,8 @@
+@@ -11237,8 +13397,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16109,7 +16197,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11254,40 +13410,52 @@
+@@ -11251,40 +13411,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16174,7 +16262,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11296,14 +13464,15 @@
+@@ -11293,14 +13465,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16183,7 +16271,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
@@ -16194,7 +16282,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11317,8 +13486,8 @@
+@@ -11314,8 +13487,8 @@
;;
*)
@@ -16205,7 +16293,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11345,53 +13514,59 @@
+@@ -11342,53 +13515,59 @@
#undef shl_load
@@ -16284,7 +16372,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11400,18 +13575,19 @@
+@@ -11397,18 +13576,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16293,7 +16381,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
@@ -16310,7 +16398,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11424,40 +13600,52 @@
+@@ -11421,40 +13601,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16375,7 +16463,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11466,19 +13654,20 @@
+@@ -11463,19 +13655,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16384,7 +16472,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
@@ -16402,7 +16490,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11505,53 +13694,59 @@
+@@ -11502,53 +13695,59 @@
#undef dlopen
@@ -16481,7 +16569,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11560,18 +13755,19 @@
+@@ -11557,18 +13756,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16490,7 +16578,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
@@ -16507,7 +16595,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11584,40 +13780,52 @@
+@@ -11581,40 +13781,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16572,7 +16660,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11626,19 +13834,20 @@
+@@ -11623,19 +13835,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16581,7 +16669,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
@@ -16599,7 +16687,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11651,40 +13860,52 @@
+@@ -11648,40 +13861,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16664,7 +16752,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11693,19 +13914,20 @@
+@@ -11690,19 +13915,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16673,7 +16761,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
@@ -16691,7 +16779,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11718,40 +13940,52 @@
+@@ -11715,40 +13941,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16756,7 +16844,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11760,14 +13994,15 @@
+@@ -11757,14 +13995,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16765,7 +16853,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
@@ -16776,7 +16864,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11802,13 +14037,13 @@
+@@ -11799,13 +14038,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16793,16 +16881,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11818,7 +14053,7 @@
+@@ -11815,7 +14054,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11821 "configure"
-+#line 14056 "configure"
+-#line 11818 "configure"
++#line 14057 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11875,6 +14110,8 @@
+@@ -11872,6 +14111,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16811,7 +16899,7 @@
exit (status);
}
-@@ -11884,12 +14121,12 @@
+@@ -11881,12 +14122,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16826,7 +16914,7 @@
esac
else :
# compilation failed
-@@ -11900,13 +14137,13 @@
+@@ -11897,13 +14138,13 @@
fi
@@ -16845,16 +16933,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11916,7 +14153,7 @@
+@@ -11913,7 +14154,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11919 "configure"
-+#line 14156 "configure"
+-#line 11916 "configure"
++#line 14157 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11973,6 +14210,8 @@
+@@ -11970,6 +14211,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16863,7 +16951,7 @@
exit (status);
}
-@@ -11982,12 +14221,12 @@
+@@ -11979,12 +14222,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16878,7 +16966,7 @@
esac
else :
# compilation failed
-@@ -11998,8 +14237,8 @@
+@@ -11995,8 +14238,8 @@
fi
@@ -16889,7 +16977,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12020,19 +14259,19 @@
+@@ -12017,19 +14260,19 @@
fi
@@ -16917,7 +17005,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12041,58 +14280,21 @@
+@@ -12038,58 +14281,21 @@
fi
;;
@@ -16983,7 +17071,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12107,7 +14309,8 @@
+@@ -12104,7 +14310,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.
@@ -16993,7 +17081,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 \
-@@ -12221,11 +14424,11 @@
+@@ -12218,11 +14425,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17007,7 +17095,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12255,6 +14458,12 @@
+@@ -12252,6 +14459,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -17020,7 +17108,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12266,6 +14475,9 @@
+@@ -12263,6 +14476,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -17030,7 +17118,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12285,7 +14497,7 @@
+@@ -12282,7 +14498,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -17039,7 +17127,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12316,7 +14528,7 @@
+@@ -12313,7 +14529,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -17048,7 +17136,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12331,7 +14543,7 @@
+@@ -12328,7 +14544,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -17057,7 +17145,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12558,7 +14770,10 @@
+@@ -12555,7 +14771,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.
@@ -17069,7 +17157,7 @@
fi
-@@ -12571,11 +14786,11 @@
+@@ -12568,11 +14787,11 @@
CC="$lt_save_CC"
@@ -17085,7 +17173,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12593,6 +14808,9 @@
+@@ -12590,6 +14809,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -17095,7 +17183,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12623,8 +14841,10 @@
+@@ -12620,8 +14842,10 @@
case $tagname in
CXX)
@@ -17108,7 +17196,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'
-@@ -12643,6 +14863,7 @@
+@@ -12640,6 +14864,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -17116,7 +17204,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12660,7 +14881,7 @@
+@@ -12657,7 +14882,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -17125,7 +17213,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12670,17 +14891,34 @@
+@@ -12667,17 +14892,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -17161,7 +17249,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12691,18 +14929,27 @@
+@@ -12688,18 +14930,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -17192,7 +17280,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12716,18 +14963,18 @@
+@@ -12713,18 +14964,18 @@
# Set up default GNU C++ configuration
@@ -17217,7 +17305,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12756,11 +15003,11 @@
+@@ -12753,11 +15004,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17233,7 +17321,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12773,7 +15020,7 @@
+@@ -12770,7 +15021,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,
@@ -17242,7 +17330,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'*)
-@@ -12793,21 +15040,21 @@
+@@ -12790,21 +15041,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17271,7 +17359,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12817,8 +15064,8 @@
+@@ -12814,8 +15065,8 @@
;;
esac
fi
@@ -17282,7 +17370,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12826,8 +15073,8 @@
+@@ -12823,8 +15074,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
@@ -17293,7 +17381,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12853,7 +15100,7 @@
+@@ -12850,7 +15101,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.
@@ -17302,7 +17390,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12868,8 +15115,8 @@
+@@ -12865,8 +15116,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17313,7 +17401,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12884,8 +15131,23 @@
+@@ -12881,8 +15132,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17339,7 +17427,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12902,7 +15164,7 @@
+@@ -12899,7 +15165,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17348,7 +17436,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`
-@@ -12921,8 +15183,12 @@
+@@ -12918,8 +15184,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17361,7 +17449,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12931,15 +15197,16 @@
+@@ -12928,15 +15198,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17382,7 +17470,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.
-@@ -12961,24 +15228,36 @@
+@@ -12958,24 +15229,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17427,7 +17515,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12992,20 +15271,21 @@
+@@ -12989,20 +15272,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17435,7 +17523,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
@@ -17453,7 +17541,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13024,24 +15304,36 @@
+@@ -13021,24 +15305,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17498,7 +17586,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13055,8 +15347,10 @@
+@@ -13052,8 +15348,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17506,11 +17594,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
-@@ -13065,16 +15359,26 @@
+@@ -13062,16 +15360,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17542,7 +17630,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13088,12 +15392,12 @@
+@@ -13085,12 +15393,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'
@@ -17557,7 +17645,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
-@@ -13102,70 +15406,81 @@
+@@ -13099,70 +15407,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17691,7 +17779,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13176,14 +15491,14 @@
+@@ -13173,14 +15492,14 @@
;;
esac
;;
@@ -17708,7 +17796,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13200,12 +15515,12 @@
+@@ -13197,12 +15516,12 @@
# location of the library.
case $cc_basename in
@@ -17724,7 +17812,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13214,11 +15529,11 @@
+@@ -13211,11 +15530,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.
@@ -17738,7 +17826,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13228,33 +15543,22 @@
+@@ -13225,33 +15544,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17779,7 +17867,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13265,17 +15569,20 @@
+@@ -13262,17 +15570,20 @@
esac
case $cc_basename in
@@ -17806,7 +17894,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13291,12 +15598,15 @@
+@@ -13288,12 +15599,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17826,7 +17914,7 @@
;;
esac
fi
-@@ -13307,11 +15617,25 @@
+@@ -13304,11 +15618,25 @@
;;
esac
;;
@@ -17854,7 +17942,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13322,9 +15646,9 @@
+@@ -13319,9 +15647,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17866,7 +17954,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13333,16 +15657,16 @@
+@@ -13330,16 +15658,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17887,7 +17975,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13360,20 +15684,44 @@
+@@ -13357,20 +15685,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -17938,7 +18026,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13401,7 +15749,7 @@
+@@ -13398,7 +15750,7 @@
;;
mvs*)
case $cc_basename in
@@ -17947,7 +18035,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13411,7 +15759,7 @@
+@@ -13408,7 +15760,7 @@
;;
esac
;;
@@ -17956,7 +18044,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=
-@@ -13422,15 +15770,31 @@
+@@ -13419,15 +15771,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::"'
;;
@@ -17990,7 +18078,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13440,14 +15804,14 @@
+@@ -13437,14 +15805,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18008,7 +18096,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13465,7 +15829,7 @@
+@@ -13462,7 +15830,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18017,7 +18105,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13484,13 +15848,13 @@
+@@ -13481,13 +15849,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -18033,7 +18121,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13499,17 +15863,17 @@
+@@ -13496,17 +15864,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -18055,7 +18143,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13528,7 +15892,7 @@
+@@ -13525,7 +15893,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18064,7 +18152,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13549,27 +15913,14 @@
+@@ -13546,27 +15914,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -18094,7 +18182,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13582,36 +15933,33 @@
+@@ -13579,36 +15934,33 @@
;;
solaris*)
case $cc_basename in
@@ -18143,7 +18231,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13619,9 +15967,9 @@
+@@ -13616,9 +15968,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -18155,7 +18243,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13631,9 +15979,9 @@
+@@ -13628,9 +15980,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
@@ -18167,7 +18255,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13642,9 +15990,9 @@
+@@ -13639,9 +15991,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -18179,7 +18267,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13657,12 +16005,63 @@
+@@ -13654,12 +16006,63 @@
;;
esac
;;
@@ -18245,7 +18333,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13682,8 +16081,8 @@
+@@ -13679,8 +16082,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18256,7 +18344,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13719,7 +16118,7 @@
+@@ -13716,7 +16119,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.
@@ -18265,7 +18353,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13759,7 +16158,7 @@
+@@ -13756,7 +16159,7 @@
fi
;;
@@ -18274,7 +18362,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13795,6 +16194,29 @@
+@@ -13792,6 +16195,29 @@
$rm -f confest.$objext
@@ -18304,7 +18392,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13803,8 +16225,8 @@
+@@ -13800,8 +16226,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18315,7 +18403,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13842,6 +16264,10 @@
+@@ -13839,6 +16265,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18326,7 +18414,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13850,7 +16276,7 @@
+@@ -13847,7 +16277,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18335,7 +18423,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13875,18 +16301,28 @@
+@@ -13872,18 +16302,28 @@
;;
chorus*)
case $cc_basename in
@@ -18367,7 +18455,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13894,22 +16330,22 @@
+@@ -13891,22 +16331,22 @@
;;
esac
;;
@@ -18396,7 +18484,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13922,9 +16358,13 @@
+@@ -13919,9 +16359,13 @@
;;
esac
;;
@@ -18411,7 +18499,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13933,20 +16373,26 @@
+@@ -13930,20 +16374,26 @@
;;
esac
;;
@@ -18442,7 +18530,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13963,25 +16409,25 @@
+@@ -13960,25 +16410,25 @@
;;
mvs*)
case $cc_basename in
@@ -18473,7 +18561,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13995,24 +16441,15 @@
+@@ -13992,24 +16442,15 @@
;;
psos*)
;;
@@ -18500,7 +18588,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -14022,12 +16459,12 @@
+@@ -14019,12 +16460,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18515,7 +18603,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14037,7 +16474,7 @@
+@@ -14034,7 +16475,7 @@
;;
tandem*)
case $cc_basename in
@@ -18524,7 +18612,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14045,7 +16482,14 @@
+@@ -14042,7 +16483,14 @@
;;
esac
;;
@@ -18540,7 +18628,7 @@
;;
vxworks*)
;;
-@@ -14055,16 +16499,16 @@
+@@ -14052,16 +16500,16 @@
esac
fi
@@ -18561,7 +18649,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14078,26 +16522,28 @@
+@@ -14075,26 +16523,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 \
@@ -18569,13 +18657,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:14084: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16528: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14081: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16529: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14088: \$? = $ac_status" >&5
-+ echo "$as_me:16532: \$? = $ac_status" >&5
+- echo "$as_me:14085: \$? = $ac_status" >&5
++ echo "$as_me:16533: \$? = $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
@@ -18597,7 +18685,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14110,7 +16556,7 @@
+@@ -14107,7 +16557,7 @@
fi
fi
@@ -18606,7 +18694,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14120,8 +16566,50 @@
+@@ -14117,8 +16567,50 @@
;;
esac
@@ -18659,7 +18747,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14132,60 +16620,58 @@
+@@ -14129,60 +16621,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18680,13 +18768,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:14151: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14148: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16633: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14155: \$? = $ac_status" >&5
-+ echo "$as_me:16636: \$? = $ac_status" >&5
+- echo "$as_me:14152: \$? = $ac_status" >&5
++ echo "$as_me:16637: \$? = $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
@@ -18738,7 +18826,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;}
-@@ -14195,8 +16681,8 @@
+@@ -14192,8 +16682,8 @@
need_locks=no
fi
@@ -18749,7 +18837,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14213,22 +16699,20 @@
+@@ -14210,22 +16700,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18778,7 +18866,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14246,8 +16730,8 @@
+@@ -14243,8 +16731,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.
@@ -18789,7 +18877,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14261,6 +16745,7 @@
+@@ -14258,6 +16746,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18797,7 +18885,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14283,20 +16768,20 @@
+@@ -14280,20 +16769,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18823,7 +18911,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14306,7 +16791,20 @@
+@@ -14303,7 +16792,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18845,7 +18933,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14371,7 +16869,7 @@
+@@ -14368,7 +16870,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18854,7 +18942,7 @@
;;
beos*)
-@@ -14380,7 +16878,7 @@
+@@ -14377,7 +16879,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18863,7 +18951,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14396,7 +16894,7 @@
+@@ -14393,7 +16895,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18872,7 +18960,7 @@
need_version=no
need_lib_prefix=no
-@@ -14408,7 +16906,8 @@
+@@ -14405,7 +16907,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18882,7 +18970,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14438,7 +16937,7 @@
+@@ -14435,7 +16938,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18891,7 +18979,7 @@
;;
esac
;;
-@@ -14461,7 +16960,7 @@
+@@ -14458,7 +16961,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18900,7 +18988,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"`
-@@ -14484,20 +16983,17 @@
+@@ -14481,20 +16984,17 @@
dynamic_linker=no
;;
@@ -18932,7 +19020,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14515,14 +17011,19 @@
+@@ -14512,14 +17012,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -18954,7 +19042,7 @@
esac
;;
-@@ -14542,9 +17043,9 @@
+@@ -14539,9 +17044,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -18966,7 +19054,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14559,7 +17060,7 @@
+@@ -14556,7 +17061,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -18975,7 +19063,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14570,7 +17071,7 @@
+@@ -14567,7 +17072,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -18984,7 +19072,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14582,6 +17083,18 @@
+@@ -14579,6 +17084,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19003,7 +19091,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14625,29 +17138,26 @@
+@@ -14622,29 +17139,26 @@
;;
# This must be Linux ELF.
@@ -19040,7 +19128,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,
-@@ -14657,6 +17167,18 @@
+@@ -14654,6 +17168,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19059,7 +19147,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14666,7 +17188,7 @@
+@@ -14663,7 +17189,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19068,7 +19156,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14694,8 +17216,13 @@
+@@ -14691,8 +17217,13 @@
openbsd*)
version_type=sunos
@@ -19083,7 +19171,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
-@@ -14715,7 +17242,7 @@
+@@ -14712,7 +17243,7 @@
os2*)
libname_spec='$name'
@@ -19092,7 +19180,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14733,13 +17260,6 @@
+@@ -14730,13 +17261,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19106,7 +19194,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14765,7 +17285,7 @@
+@@ -14762,7 +17286,7 @@
need_version=yes
;;
@@ -19115,7 +19203,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'
-@@ -14798,6 +17318,29 @@
+@@ -14795,6 +17319,29 @@
fi
;;
@@ -19145,7 +19233,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14809,16 +17352,21 @@
+@@ -14806,16 +17353,21 @@
dynamic_linker=no
;;
esac
@@ -19173,7 +19261,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14838,8 +17386,8 @@
+@@ -14835,8 +17387,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -19184,7 +19272,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14850,998 +17398,173 @@
+@@ -14847,998 +17399,173 @@
enable_fast_install=needless
fi
@@ -19959,7 +20047,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15487 "configure"
+-#line 15484 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -20057,7 +20145,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15585 "configure"
+-#line 15582 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -20322,7 +20410,7 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-@@ -15860,7 +17583,7 @@
+@@ -15857,7 +17584,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -20331,7 +20419,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15875,7 +17598,7 @@
+@@ -15872,7 +17599,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -20340,7 +20428,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -16077,7 +17800,10 @@
+@@ -16074,7 +17801,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.
@@ -20352,7 +20440,7 @@
fi
-@@ -16149,29 +17875,55 @@
+@@ -16146,29 +17876,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20392,19 +20480,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
@@ -20416,7 +20504,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16179,21 +17931,21 @@
+@@ -16176,21 +17932,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20448,7 +20536,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16202,8 +17954,8 @@
+@@ -16199,8 +17955,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20459,7 +20547,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16241,6 +17993,11 @@
+@@ -16238,6 +17994,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20471,7 +20559,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16257,7 +18014,7 @@
+@@ -16254,7 +18015,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20480,7 +20568,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16283,6 +18040,16 @@
+@@ -16280,6 +18041,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20497,7 +20585,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16294,7 +18061,7 @@
+@@ -16291,7 +18062,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.
@@ -20506,7 +20594,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16317,13 +18084,20 @@
+@@ -16314,14 +18085,21 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20519,6 +20607,7 @@
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-static'
;;
+- ccc*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
@@ -20526,10 +20615,11 @@
+ lt_prog_compiler_pic_F77='-fpic'
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
- ccc*)
++ ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16338,15 +18112,15 @@
+ lt_prog_compiler_static_F77='-non_shared'
+@@ -16335,15 +18113,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -20551,7 +20641,7 @@
;;
sunos4*)
-@@ -16355,7 +18129,7 @@
+@@ -16352,7 +18130,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -20560,7 +20650,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16368,6 +18142,17 @@
+@@ -16365,6 +18143,17 @@
fi
;;
@@ -20578,7 +20668,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16379,16 +18164,16 @@
+@@ -16376,16 +18165,16 @@
esac
fi
@@ -20599,7 +20689,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16402,26 +18187,28 @@
+@@ -16399,26 +18188,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 \
@@ -20607,13 +20697,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:16408: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18193: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16405: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18194: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16412: \$? = $ac_status" >&5
-+ echo "$as_me:18197: \$? = $ac_status" >&5
+- echo "$as_me:16409: \$? = $ac_status" >&5
++ echo "$as_me:18198: \$? = $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
@@ -20635,7 +20725,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16434,7 +18221,7 @@
+@@ -16431,7 +18222,7 @@
fi
fi
@@ -20644,7 +20734,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16444,8 +18231,50 @@
+@@ -16441,8 +18232,50 @@
;;
esac
@@ -20697,7 +20787,7 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16456,60 +18285,58 @@
+@@ -16453,60 +18286,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -20718,13 +20808,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:16475: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18297: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16472: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18298: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16479: \$? = $ac_status" >&5
-+ echo "$as_me:18301: \$? = $ac_status" >&5
+- echo "$as_me:16476: \$? = $ac_status" >&5
++ echo "$as_me:18302: \$? = $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
@@ -20776,7 +20866,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;}
-@@ -16519,8 +18346,8 @@
+@@ -16516,8 +18347,8 @@
need_locks=no
fi
@@ -20787,7 +20877,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16558,6 +18385,16 @@
+@@ -16555,6 +18386,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -20804,7 +20894,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16568,6 +18405,10 @@
+@@ -16565,6 +18406,10 @@
with_gnu_ld=no
fi
;;
@@ -20815,7 +20905,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16578,6 +18419,27 @@
+@@ -16575,6 +18420,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -20843,7 +20933,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16615,7 +18477,7 @@
+@@ -16612,7 +18478,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -20852,7 +20942,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16625,13 +18487,13 @@
+@@ -16622,13 +18488,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'
@@ -20869,7 +20959,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
-@@ -16640,23 +18502,70 @@
+@@ -16637,23 +18503,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -20946,7 +21036,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16670,13 +18579,40 @@
+@@ -16667,13 +18580,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20989,7 +21079,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16686,24 +18622,19 @@
+@@ -16683,24 +18623,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21021,7 +21111,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16715,7 +18646,7 @@
+@@ -16712,7 +18647,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21030,7 +21120,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16737,9 +18668,21 @@
+@@ -16734,9 +18669,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
@@ -21054,7 +21144,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16756,7 +18699,7 @@
+@@ -16753,7 +18700,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21063,7 +21153,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`
-@@ -16775,8 +18718,12 @@
+@@ -16772,8 +18719,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21076,7 +21166,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16784,45 +18731,58 @@
+@@ -16781,45 +18732,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21150,7 +21240,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16836,19 +18796,20 @@
+@@ -16833,19 +18797,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21158,7 +21248,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
@@ -21176,7 +21266,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16857,24 +18818,36 @@
+@@ -16854,24 +18819,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21221,7 +21311,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16888,8 +18861,10 @@
+@@ -16885,8 +18862,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21229,11 +21319,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
-@@ -16898,13 +18873,11 @@
+@@ -16895,13 +18874,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21250,7 +21340,7 @@
fi
fi
;;
-@@ -16917,7 +18890,7 @@
+@@ -16914,7 +18891,7 @@
ld_shlibs_F77=no
;;
@@ -21259,7 +21349,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16927,68 +18900,68 @@
+@@ -16924,68 +18901,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21372,7 +21462,7 @@
fi
;;
-@@ -17022,8 +18995,8 @@
+@@ -17019,8 +18996,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21383,7 +21473,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17031,7 +19004,7 @@
+@@ -17028,7 +19005,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21392,7 +21482,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
-@@ -17045,47 +19018,62 @@
+@@ -17042,47 +19019,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21461,25 +21551,25 @@
+ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
+- hardcode_direct_F77=no
+- hardcode_shlibpath_var_F77=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
- ;;
-- ia64*)
-- hardcode_libdir_flag_spec_F77='-L$libdir'
-- hardcode_direct_F77=no
-- hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
-- ;;
+ ;;
*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17099,7 +19087,7 @@
+@@ -17096,7 +19088,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21488,7 +21578,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'
-@@ -17109,7 +19097,7 @@
+@@ -17106,7 +19098,7 @@
link_all_deplibs_F77=yes
;;
@@ -21497,7 +21587,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
-@@ -17132,7 +19120,8 @@
+@@ -17129,7 +19121,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
@@ -21507,7 +21597,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17142,7 +19131,7 @@
+@@ -17139,7 +19132,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21516,7 +21606,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17153,14 +19142,14 @@
+@@ -17150,14 +19143,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -21533,7 +21623,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'
-@@ -17172,13 +19161,13 @@
+@@ -17169,13 +19162,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21549,7 +21639,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17186,21 +19175,15 @@
+@@ -17183,21 +19176,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -21575,7 +21665,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'
-@@ -17209,8 +19192,18 @@
+@@ -17206,8 +19193,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21596,7 +21686,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17219,7 +19212,7 @@
+@@ -17216,7 +19213,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.
@@ -21605,7 +21695,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17267,36 +19260,45 @@
+@@ -17264,36 +19261,45 @@
fi
;;
@@ -21672,7 +21762,7 @@
;;
uts4*)
-@@ -17311,15 +19313,10 @@
+@@ -17308,15 +19314,10 @@
esac
fi
@@ -21690,7 +21780,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17337,8 +19334,8 @@
+@@ -17334,8 +19335,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.
@@ -21701,7 +21791,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17352,6 +19349,7 @@
+@@ -17349,6 +19350,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -21709,7 +21799,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17374,20 +19372,20 @@
+@@ -17371,20 +19373,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -21735,7 +21825,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17397,7 +19395,20 @@
+@@ -17394,7 +19396,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21757,7 +21847,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17462,7 +19473,7 @@
+@@ -17459,7 +19474,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21766,7 +21856,7 @@
;;
beos*)
-@@ -17471,7 +19482,7 @@
+@@ -17468,7 +19483,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -21775,7 +21865,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17487,7 +19498,7 @@
+@@ -17484,7 +19499,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -21784,7 +21874,7 @@
need_version=no
need_lib_prefix=no
-@@ -17499,7 +19510,8 @@
+@@ -17496,7 +19511,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -21794,7 +21884,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17529,7 +19541,7 @@
+@@ -17526,7 +19542,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21803,7 +21893,7 @@
;;
esac
;;
-@@ -17552,7 +19564,7 @@
+@@ -17549,7 +19565,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -21812,7 +21902,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"`
-@@ -17575,20 +19587,17 @@
+@@ -17572,20 +19588,17 @@
dynamic_linker=no
;;
@@ -21844,7 +21934,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17606,14 +19615,19 @@
+@@ -17603,14 +19616,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -21866,7 +21956,7 @@
esac
;;
-@@ -17633,9 +19647,9 @@
+@@ -17630,9 +19648,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -21878,7 +21968,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17650,7 +19664,7 @@
+@@ -17647,7 +19665,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -21887,7 +21977,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17661,7 +19675,7 @@
+@@ -17658,7 +19676,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -21896,7 +21986,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17673,6 +19687,18 @@
+@@ -17670,6 +19688,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -21915,7 +22005,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17716,29 +19742,26 @@
+@@ -17713,29 +19743,26 @@
;;
# This must be Linux ELF.
@@ -21952,7 +22042,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,
-@@ -17748,6 +19771,18 @@
+@@ -17745,6 +19772,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21971,7 +22061,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17757,7 +19792,7 @@
+@@ -17754,7 +19793,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -21980,7 +22070,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17785,8 +19820,13 @@
+@@ -17782,8 +19821,13 @@
openbsd*)
version_type=sunos
@@ -21995,7 +22085,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
-@@ -17806,7 +19846,7 @@
+@@ -17803,7 +19847,7 @@
os2*)
libname_spec='$name'
@@ -22004,7 +22094,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17824,13 +19864,6 @@
+@@ -17821,13 +19865,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22018,7 +22108,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17856,7 +19889,7 @@
+@@ -17853,7 +19890,7 @@
need_version=yes
;;
@@ -22027,7 +22117,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'
-@@ -17889,6 +19922,29 @@
+@@ -17886,6 +19923,29 @@
fi
;;
@@ -22057,7 +22147,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17900,16 +19956,21 @@
+@@ -17897,16 +19957,21 @@
dynamic_linker=no
;;
esac
@@ -22085,7 +22175,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17929,8 +19990,8 @@
+@@ -17926,8 +19991,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22096,7 +22186,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17941,36 +20002,6 @@
+@@ -17938,36 +20003,6 @@
enable_fast_install=needless
fi
@@ -22133,7 +22223,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17985,7 +20016,8 @@
+@@ -17982,7 +20017,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.
@@ -22143,7 +22233,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 \
-@@ -18085,6 +20117,12 @@
+@@ -18082,6 +20118,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22156,7 +22246,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18096,6 +20134,9 @@
+@@ -18093,6 +20135,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22166,7 +22256,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18115,7 +20156,7 @@
+@@ -18112,7 +20157,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22175,7 +22265,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18146,7 +20187,7 @@
+@@ -18143,7 +20188,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22184,7 +22274,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18161,7 +20202,7 @@
+@@ -18158,7 +20203,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22193,7 +22283,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18363,7 +20404,10 @@
+@@ -18360,7 +20405,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.
@@ -22205,7 +22295,7 @@
fi
-@@ -18384,7 +20428,6 @@
+@@ -18381,7 +20429,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22213,7 +22303,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18396,26 +20439,55 @@
+@@ -18393,26 +20440,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22270,7 +22360,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
-@@ -18427,8 +20499,8 @@
+@@ -18424,8 +20500,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22281,7 +22371,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18442,26 +20514,28 @@
+@@ -18439,26 +20515,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 \
@@ -22289,13 +22379,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:18448: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20520: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18445: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20521: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18452: \$? = $ac_status" >&5
-+ echo "$as_me:20524: \$? = $ac_status" >&5
+- echo "$as_me:18449: \$? = $ac_status" >&5
++ echo "$as_me:20525: \$? = $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
@@ -22317,7 +22407,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"
-@@ -18475,8 +20549,8 @@
+@@ -18472,8 +20550,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22328,7 +22418,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18514,6 +20588,11 @@
+@@ -18511,6 +20589,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22340,7 +22430,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18530,7 +20609,7 @@
+@@ -18527,7 +20610,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22349,7 +22439,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18556,6 +20635,16 @@
+@@ -18553,6 +20636,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22366,7 +22456,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18567,7 +20656,7 @@
+@@ -18564,7 +20657,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.
@@ -22375,7 +22465,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18590,13 +20679,20 @@
+@@ -18587,13 +20680,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22398,7 +22488,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18611,15 +20707,15 @@
+@@ -18608,15 +20708,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22420,7 +22510,7 @@
;;
sunos4*)
-@@ -18628,7 +20724,7 @@
+@@ -18625,7 +20725,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22429,7 +22519,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18641,6 +20737,17 @@
+@@ -18638,6 +20738,17 @@
fi
;;
@@ -22447,7 +22537,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18652,16 +20759,16 @@
+@@ -18649,16 +20760,16 @@
esac
fi
@@ -22468,7 +22558,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18675,26 +20782,28 @@
+@@ -18672,26 +20783,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 \
@@ -22476,13 +22566,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:18681: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20788: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18678: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20789: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18685: \$? = $ac_status" >&5
-+ echo "$as_me:20792: \$? = $ac_status" >&5
+- echo "$as_me:18682: \$? = $ac_status" >&5
++ echo "$as_me:20793: \$? = $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
@@ -22504,7 +22594,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18707,7 +20816,7 @@
+@@ -18704,7 +20817,7 @@
fi
fi
@@ -22513,7 +22603,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18717,8 +20826,50 @@
+@@ -18714,8 +20827,50 @@
;;
esac
@@ -22566,7 +22656,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18729,60 +20880,58 @@
+@@ -18726,60 +20881,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -22587,13 +22677,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:18748: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20892: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18745: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20893: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18752: \$? = $ac_status" >&5
-+ echo "$as_me:20896: \$? = $ac_status" >&5
+- echo "$as_me:18749: \$? = $ac_status" >&5
++ echo "$as_me:20897: \$? = $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
@@ -22645,7 +22735,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;}
-@@ -18792,8 +20941,8 @@
+@@ -18789,8 +20942,8 @@
need_locks=no
fi
@@ -22656,7 +22746,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18831,6 +20980,16 @@
+@@ -18828,6 +20981,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -22673,7 +22763,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18841,6 +21000,10 @@
+@@ -18838,6 +21001,10 @@
with_gnu_ld=no
fi
;;
@@ -22684,7 +22774,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18851,6 +21014,27 @@
+@@ -18848,6 +21015,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -22712,7 +22802,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18888,7 +21072,7 @@
+@@ -18885,7 +21073,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -22721,7 +22811,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18898,13 +21082,13 @@
+@@ -18895,13 +21083,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'
@@ -22738,7 +22828,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
-@@ -18913,23 +21097,70 @@
+@@ -18910,23 +21098,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -22815,7 +22905,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18943,13 +21174,40 @@
+@@ -18940,13 +21175,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22858,7 +22948,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18959,24 +21217,19 @@
+@@ -18956,24 +21218,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22890,7 +22980,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18988,7 +21241,7 @@
+@@ -18985,7 +21242,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -22899,7 +22989,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -19010,9 +21263,21 @@
+@@ -19007,9 +21264,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
@@ -22923,7 +23013,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19029,7 +21294,7 @@
+@@ -19026,7 +21295,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -22932,7 +23022,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`
-@@ -19048,8 +21313,12 @@
+@@ -19045,8 +21314,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -22945,7 +23035,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19057,22 +21326,23 @@
+@@ -19054,22 +21327,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -22976,7 +23066,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19088,24 +21358,36 @@
+@@ -19085,24 +21359,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23021,7 +23111,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19119,19 +21401,20 @@
+@@ -19116,19 +21402,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23029,7 +23119,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
@@ -23047,7 +23137,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19150,24 +21433,36 @@
+@@ -19147,24 +21434,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23092,7 +23182,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19181,8 +21476,10 @@
+@@ -19178,8 +21477,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23100,11 +23190,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
-@@ -19191,13 +21488,11 @@
+@@ -19188,13 +21489,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23121,7 +23211,7 @@
fi
fi
;;
-@@ -19210,7 +21505,7 @@
+@@ -19207,7 +21506,7 @@
ld_shlibs_GCJ=no
;;
@@ -23130,7 +23220,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19220,68 +21515,68 @@
+@@ -19217,68 +21516,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23243,7 +23333,7 @@
fi
;;
-@@ -19315,8 +21610,8 @@
+@@ -19312,8 +21611,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23254,7 +23344,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19324,7 +21619,7 @@
+@@ -19321,7 +21620,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23263,7 +23353,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
-@@ -19338,47 +21633,62 @@
+@@ -19335,47 +21634,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23350,7 +23440,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19392,7 +21702,7 @@
+@@ -19389,7 +21703,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23359,7 +23449,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'
-@@ -19402,7 +21712,7 @@
+@@ -19399,7 +21713,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23368,7 +23458,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
-@@ -19425,7 +21735,8 @@
+@@ -19422,7 +21736,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
@@ -23378,7 +23468,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19435,7 +21746,7 @@
+@@ -19432,7 +21747,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23387,7 +23477,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19446,14 +21757,14 @@
+@@ -19443,14 +21758,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23404,7 +23494,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'
-@@ -19465,13 +21776,13 @@
+@@ -19462,13 +21777,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23420,7 +23510,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19479,21 +21790,15 @@
+@@ -19476,21 +21791,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23446,7 +23536,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'
-@@ -19502,8 +21807,18 @@
+@@ -19499,8 +21808,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23467,7 +23557,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19512,7 +21827,7 @@
+@@ -19509,7 +21828,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.
@@ -23476,7 +23566,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19560,36 +21875,45 @@
+@@ -19557,37 +21876,46 @@
fi
;;
@@ -23532,6 +23622,7 @@
+ link_all_deplibs_GCJ=yes
+ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+- ;;
+
+ if test "$GCC" = yes; then
+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -23540,10 +23631,11 @@
+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
- ;;
++ ;;
uts4*)
-@@ -19604,15 +21928,10 @@
+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+@@ -19601,15 +21929,10 @@
esac
fi
@@ -23561,7 +23653,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -19630,8 +21949,8 @@
+@@ -19627,8 +21950,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.
@@ -23572,7 +23664,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -19645,6 +21964,7 @@
+@@ -19642,6 +21965,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_GCJ
@@ -23580,7 +23672,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -19667,20 +21987,20 @@
+@@ -19664,20 +21988,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -23606,7 +23698,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19690,7 +22010,20 @@
+@@ -19687,7 +22011,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23628,7 +23720,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19755,7 +22088,7 @@
+@@ -19752,7 +22089,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23637,7 +23729,7 @@
;;
beos*)
-@@ -19764,7 +22097,7 @@
+@@ -19761,7 +22098,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -23646,7 +23738,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19780,7 +22113,7 @@
+@@ -19777,7 +22114,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -23655,7 +23747,7 @@
need_version=no
need_lib_prefix=no
-@@ -19792,7 +22125,8 @@
+@@ -19789,7 +22126,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -23665,7 +23757,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19822,7 +22156,7 @@
+@@ -19819,7 +22157,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23674,7 +23766,7 @@
;;
esac
;;
-@@ -19845,7 +22179,7 @@
+@@ -19842,7 +22180,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -23683,7 +23775,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"`
-@@ -19868,20 +22202,17 @@
+@@ -19865,20 +22203,17 @@
dynamic_linker=no
;;
@@ -23715,7 +23807,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19899,14 +22230,19 @@
+@@ -19896,14 +22231,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -23737,7 +23829,7 @@
esac
;;
-@@ -19926,9 +22262,9 @@
+@@ -19923,9 +22263,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -23749,55 +23841,90 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19943,7 +22279,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
+@@ -19933,1137 +22273,349 @@
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ if test "X$HPUX_IA64_MODE" = X32; then
+- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+- else
+- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+- fi
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- hppa*64*)
- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19954,7 +22290,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+- hardcode_into_libs=yes
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+- ;;
+- *)
- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19966,6 +22302,18 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-+interix3*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+
- irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-@@ -20009,29 +22357,26 @@
- ;;
-
- # This must be Linux ELF.
+- dynamic_linker="$host_os dld.sl"
+- shlibpath_var=SHLIB_PATH
+- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- ;;
+- esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+- postinstall_cmds='chmod 555 $lib'
+- ;;
+-
+-irix5* | irix6* | nonstopux*)
+- case $host_os in
+- nonstopux*) version_type=nonstopux ;;
+- *)
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+- version_type=irix
+- fi ;;
+- esac
+- 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}${release}${shared_ext} $libname${shared_ext}'
+- case $host_os in
+- irix5* | nonstopux*)
+- libsuff= shlibsuff=
+- ;;
+- *)
+- case $LD in # libtool.m4 will add one of these switches to LD
+- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+- libsuff= shlibsuff= libmagic=32-bit;;
+- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+- libsuff=32 shlibsuff=N32 libmagic=N32;;
+- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+- libsuff=64 shlibsuff=64 libmagic=64-bit;;
+- *) libsuff= shlibsuff= libmagic=never-match;;
+- esac
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+- hardcode_into_libs=yes
+- ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+- dynamic_linker=no
+- ;;
+-
+-# This must be Linux ELF.
-linux*)
-+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
@@ -23805,80 +23932,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,
-@@ -20041,6 +22386,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
-@@ -20050,7 +22407,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
-@@ -20078,8 +22435,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
-@@ -20099,7 +22461,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'
-@@ -20117,13 +22479,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'
@@ -23886,22 +24033,54 @@
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
- solaris*)
- version_type=linux
- need_lib_prefix=no
-@@ -20149,7 +22504,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'
-@@ -20172,901 +22527,94 @@
- ;;
- esac
- ;;
+- 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
@@ -24551,31 +24730,203 @@
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
--
--
++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++ else
++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++ fi
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ hppa*64*)
++ shrext_cmds='.sl'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ *)
++ shrext_cmds='.sl'
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=SHLIB_PATH
++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ ;;
++ esac
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
++ postinstall_cmds='chmod 555 $lib'
++ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
-fi
--
--
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ version_type=linux
++ else
++ version_type=irix
++ fi ;;
++ esac
++ 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}${release}${shared_ext} $libname${shared_ext}'
++ case $host_os in
++ irix5* | nonstopux*)
++ libsuff= shlibsuff=
++ ;;
++ *)
++ case $LD in # libtool.m4 will add one of these switches to LD
++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++ libsuff= shlibsuff= libmagic=32-bit;;
++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ libsuff=32 shlibsuff=N32 libmagic=N32;;
++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++ libsuff=64 shlibsuff=64 libmagic=64-bit;;
++ *) libsuff= shlibsuff= libmagic=never-match;;
++ esac
++ ;;
++ esac
++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ hardcode_into_libs=yes
++ ;;
+
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
+
-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'
++ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
+
-fi
--
--
++netbsd*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='NetBSD (a.out) ld.so'
++ else
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
++newsos6)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
-fi
--
++nto-qnx*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
- ;;
-- esac
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
+ esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-- else
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
+ else
- enable_dlopen=no
-- fi
--
++ shlibpath_overrides_runpath=yes
+ fi
++ ;;
+
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
@@ -24598,7 +24949,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20871 "configure"
+-#line 20868 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -24606,7 +24957,15 @@
-#endif
-
-#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
@@ -24616,7 +24975,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
@@ -24638,24 +25007,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
@@ -24670,11 +25093,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*
-
@@ -24696,7 +25137,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20969 "configure"
+-#line 20966 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -24740,20 +25181,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
@@ -24768,72 +25224,17 @@
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+
-+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
-+ ;;
-+
-+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
+- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
--fi
--rm -fr conftest*
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-
-+*)
-+ 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=
@@ -24841,10 +25242,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
@@ -24862,7 +25259,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; }
@@ -24880,7 +25291,7 @@
fi
-@@ -21083,7 +22631,8 @@
+@@ -21080,7 +22632,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.
@@ -24890,7 +25301,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 \
-@@ -21183,6 +22732,12 @@
+@@ -21180,6 +22733,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -24903,7 +25314,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21194,6 +22749,9 @@
+@@ -21191,6 +22750,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -24913,7 +25324,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21213,7 +22771,7 @@
+@@ -21210,7 +22772,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -24922,7 +25333,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21244,7 +22802,7 @@
+@@ -21241,7 +22803,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -24931,7 +25342,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21259,7 +22817,7 @@
+@@ -21256,7 +22818,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -24940,7 +25351,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21461,7 +23019,10 @@
+@@ -21458,7 +23020,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.
@@ -24952,7 +25363,7 @@
fi
-@@ -21481,7 +23042,6 @@
+@@ -21478,7 +23043,6 @@
RC)
@@ -24960,7 +25371,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21500,15 +23060,42 @@
+@@ -21497,15 +23061,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -25003,7 +25414,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21524,7 +23111,8 @@
+@@ -21521,7 +23112,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.
@@ -25013,7 +25424,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 \
-@@ -21624,6 +23212,12 @@
+@@ -21621,6 +23213,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -25026,7 +25437,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21635,6 +23229,9 @@
+@@ -21632,6 +23230,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -25036,7 +25447,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21654,7 +23251,7 @@
+@@ -21651,7 +23252,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -25045,7 +25456,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21685,7 +23282,7 @@
+@@ -21682,7 +23283,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -25054,7 +25465,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21700,7 +23297,7 @@
+@@ -21697,7 +23298,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -25063,7 +25474,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21902,7 +23499,10 @@
+@@ -21899,7 +23500,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.
@@ -25075,7 +25486,7 @@
fi
-@@ -21949,7 +23549,7 @@
+@@ -21946,7 +23550,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -25084,7 +25495,7 @@
# Prevent multiple expansion
-@@ -22004,8 +23604,8 @@
+@@ -22001,8 +23605,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -25095,7 +25506,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22031,17 +23631,17 @@
+@@ -22028,17 +23632,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -25119,7 +25530,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22056,32 +23656,33 @@
+@@ -22053,32 +23657,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25161,7 +25572,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22090,8 +23691,8 @@
+@@ -22087,8 +23692,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -25172,7 +25583,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22117,11 +23718,11 @@
+@@ -22114,11 +23719,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -25188,7 +25599,7 @@
fi
-@@ -22129,8 +23730,8 @@
+@@ -22126,8 +23731,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -25199,7 +25610,7 @@
XGETTEXT=":"
fi
fi
-@@ -22140,8 +23741,7 @@
+@@ -22137,8 +23742,7 @@
@@ -25209,7 +25620,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'
-@@ -22153,8 +23753,8 @@
+@@ -22150,8 +23754,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -25220,7 +25631,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22182,24 +23782,36 @@
+@@ -22179,24 +23783,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25265,7 +25676,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22208,15 +23820,16 @@
+@@ -22205,15 +23821,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25286,7 +25697,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22245,15 +23858,14 @@
+@@ -22242,15 +23859,14 @@
@@ -25305,7 +25716,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'
-@@ -22265,9 +23877,6 @@
+@@ -22262,9 +23878,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25315,7 +25726,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22293,24 +23902,36 @@
+@@ -22290,24 +23903,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25360,7 +25771,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22319,9 +23940,10 @@
+@@ -22316,9 +23941,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25373,7 +25784,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22334,11 +23956,11 @@
+@@ -22331,11 +23957,11 @@
fi
@@ -25389,7 +25800,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22359,8 +23981,7 @@
+@@ -22356,8 +23982,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -25399,7 +25810,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'
-@@ -22398,24 +24019,36 @@
+@@ -22395,24 +24020,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25444,7 +25855,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22425,10 +24058,11 @@
+@@ -22422,10 +24059,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25454,11 +25865,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
-@@ -22441,8 +24075,8 @@
+@@ -22438,8 +24076,8 @@
fi
@@ -25469,7 +25880,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22466,15 +24100,14 @@
+@@ -22463,15 +24101,14 @@
@@ -25488,7 +25899,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'
-@@ -22486,9 +24119,6 @@
+@@ -22483,9 +24120,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25498,7 +25909,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22513,24 +24143,36 @@
+@@ -22510,24 +24144,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25543,7 +25954,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22539,9 +24181,10 @@
+@@ -22536,9 +24182,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25556,7 +25967,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22554,11 +24197,11 @@
+@@ -22551,11 +24198,11 @@
fi
@@ -25572,7 +25983,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22579,8 +24222,7 @@
+@@ -22576,8 +24223,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -25582,7 +25993,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'
-@@ -22617,24 +24259,36 @@
+@@ -22614,24 +24260,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25627,7 +26038,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22644,10 +24298,11 @@
+@@ -22641,10 +24299,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25637,11 +26048,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
-@@ -22660,8 +24315,8 @@
+@@ -22657,8 +24316,8 @@
fi
@@ -25652,7 +26063,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22684,8 +24339,8 @@
+@@ -22681,8 +24340,8 @@
@@ -25663,7 +26074,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22702,30 +24357,42 @@
+@@ -22699,30 +24358,42 @@
int
main ()
{
@@ -25715,7 +26126,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22734,20 +24401,21 @@
+@@ -22731,20 +24402,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25724,7 +26135,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
@@ -25743,7 +26154,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22764,30 +24432,42 @@
+@@ -22761,30 +24433,42 @@
int
main ()
{
@@ -25795,7 +26206,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22796,21 +24476,22 @@
+@@ -22793,21 +24477,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25804,7 +26215,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
@@ -25824,7 +26235,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22823,40 +24504,52 @@
+@@ -22820,40 +24505,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25889,7 +26300,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22865,19 +24558,20 @@
+@@ -22862,19 +24559,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25898,7 +26309,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
@@ -25916,7 +26327,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22890,40 +24584,52 @@
+@@ -22887,40 +24585,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25981,7 +26392,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22932,14 +24638,15 @@
+@@ -22929,14 +24639,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25990,7 +26401,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
@@ -26001,7 +26412,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22965,13 +24672,13 @@
+@@ -22962,13 +24673,13 @@
fi
@@ -26018,7 +26429,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'
-@@ -23000,24 +24707,36 @@
+@@ -22997,24 +24708,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26063,7 +26474,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23029,8 +24748,10 @@
+@@ -23026,8 +24749,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26075,7 +26486,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23040,17 +24761,17 @@
+@@ -23037,17 +24762,17 @@
fi
@@ -26098,7 +26509,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'
-@@ -23079,24 +24800,36 @@
+@@ -23076,24 +24801,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26143,7 +26554,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23108,8 +24841,10 @@
+@@ -23105,8 +24842,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26155,7 +26566,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23120,8 +24855,8 @@
+@@ -23117,8 +24856,8 @@
fi
@@ -26166,7 +26577,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23134,8 +24869,8 @@
+@@ -23131,8 +24870,8 @@
_ACEOF
@@ -26177,7 +26588,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23148,40 +24883,52 @@
+@@ -23145,40 +24884,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26242,7 +26653,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23190,21 +24937,22 @@
+@@ -23187,21 +24938,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26251,7 +26662,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
@@ -26271,7 +26682,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23217,40 +24965,52 @@
+@@ -23214,40 +24966,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26336,7 +26747,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23259,21 +25019,22 @@
+@@ -23256,21 +25020,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26345,7 +26756,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
@@ -26365,7 +26776,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23300,53 +25061,59 @@
+@@ -23297,53 +25062,59 @@
#undef inet_ntoa
@@ -26444,7 +26855,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23355,17 +25122,18 @@
+@@ -23352,17 +25123,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26453,7 +26864,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
@@ -26469,7 +26880,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23378,40 +25146,52 @@
+@@ -23375,40 +25147,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26534,7 +26945,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23420,21 +25200,22 @@
+@@ -23417,21 +25201,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26543,7 +26954,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
@@ -26563,7 +26974,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23461,53 +25242,59 @@
+@@ -23458,53 +25243,59 @@
#undef connect
@@ -26642,7 +27053,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23516,17 +25303,18 @@
+@@ -23513,17 +25304,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26651,7 +27062,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
@@ -26667,7 +27078,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23539,40 +25327,52 @@
+@@ -23536,40 +25328,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26732,7 +27143,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23581,22 +25381,23 @@
+@@ -23578,22 +25382,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26741,7 +27152,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
@@ -26762,7 +27173,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23623,53 +25424,59 @@
+@@ -23620,53 +25425,59 @@
#undef remove
@@ -26841,7 +27252,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23678,17 +25485,18 @@
+@@ -23675,17 +25486,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26850,7 +27261,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
@@ -26866,7 +27277,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23701,40 +25509,52 @@
+@@ -23698,40 +25510,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26931,7 +27342,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23743,14 +25563,15 @@
+@@ -23740,14 +25564,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26940,7 +27351,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
@@ -26951,7 +27362,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23758,8 +25579,8 @@
+@@ -23755,8 +25580,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -26962,7 +27373,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23786,53 +25607,59 @@
+@@ -23783,53 +25608,59 @@
#undef shmat
@@ -27041,7 +27452,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23841,18 +25668,19 @@
+@@ -23838,18 +25669,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27050,7 +27461,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
@@ -27067,7 +27478,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23865,40 +25693,52 @@
+@@ -23862,40 +25694,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27132,7 +27543,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23907,14 +25747,15 @@
+@@ -23904,14 +25748,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27141,7 +27552,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
@@ -27152,7 +27563,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23928,18 +25769,19 @@
+@@ -23925,18 +25770,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27180,7 +27591,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23950,24 +25792,36 @@
+@@ -23947,24 +25793,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27225,7 +27636,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23976,15 +25830,16 @@
+@@ -23973,15 +25831,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27248,7 +27659,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23993,8 +25848,13 @@
+@@ -23990,8 +25849,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27264,7 +27675,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24018,9 +25878,10 @@
+@@ -24015,9 +25879,10 @@
ac_header_preproc=no
fi
@@ -27277,7 +27688,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24044,25 +25905,19 @@
+@@ -24041,25 +25906,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;}
@@ -27310,7 +27721,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24080,18 +25935,19 @@
+@@ -24077,18 +25936,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27338,7 +27749,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24102,24 +25958,36 @@
+@@ -24099,24 +25959,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27383,7 +27794,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24128,15 +25996,16 @@
+@@ -24125,15 +25997,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27406,7 +27817,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24145,8 +26014,13 @@
+@@ -24142,8 +26015,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27422,7 +27833,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24170,9 +26044,10 @@
+@@ -24167,9 +26045,10 @@
ac_header_preproc=no
fi
@@ -27435,7 +27846,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24196,25 +26071,19 @@
+@@ -24193,25 +26072,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;}
@@ -27468,7 +27879,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24228,8 +26097,8 @@
+@@ -24225,8 +26098,8 @@
# darwin requires a poll emulation library
@@ -27479,7 +27890,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24242,40 +26111,52 @@
+@@ -24239,40 +26112,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27544,7 +27955,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24284,14 +26165,15 @@
+@@ -24281,14 +26166,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27553,7 +27964,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
@@ -27564,7 +27975,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24302,18 +26184,19 @@
+@@ -24299,18 +26185,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27592,7 +28003,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24324,24 +26207,36 @@
+@@ -24321,24 +26208,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -27637,7 +28048,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24350,15 +26245,16 @@
+@@ -24347,15 +26246,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27660,7 +28071,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24367,8 +26263,13 @@
+@@ -24364,8 +26264,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -27676,7 +28087,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24392,9 +26293,10 @@
+@@ -24389,9 +26294,10 @@
ac_header_preproc=no
fi
@@ -27689,7 +28100,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24418,25 +26320,19 @@
+@@ -24415,25 +26321,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;}
@@ -27722,7 +28133,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24451,17 +26347,17 @@
+@@ -24448,17 +26348,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -27746,7 +28157,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24472,24 +26368,36 @@
+@@ -24469,24 +26369,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -27791,7 +28202,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24498,15 +26406,16 @@
+@@ -24495,15 +26407,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27814,7 +28225,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24515,8 +26424,13 @@
+@@ -24512,8 +26425,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -27830,7 +28241,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24540,9 +26454,10 @@
+@@ -24537,9 +26455,10 @@
ac_header_preproc=no
fi
@@ -27843,7 +28254,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24566,25 +26481,18 @@
+@@ -24563,25 +26482,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;}
@@ -27874,7 +28285,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24601,8 +26509,8 @@
+@@ -24598,8 +26510,8 @@
@@ -27885,7 +28296,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24628,31 +26536,43 @@
+@@ -24625,31 +26537,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27939,7 +28350,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24663,25 +26583,25 @@
+@@ -24660,25 +26584,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27951,7 +28362,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
@@ -27972,7 +28383,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'
-@@ -24693,9 +26613,6 @@
+@@ -24690,9 +26614,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27982,7 +28393,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24721,24 +26638,36 @@
+@@ -24718,24 +26639,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28027,7 +28438,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24747,9 +26676,10 @@
+@@ -24744,9 +26677,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28040,7 +28451,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24762,11 +26692,11 @@
+@@ -24759,11 +26693,11 @@
fi
@@ -28056,7 +28467,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24787,8 +26717,7 @@
+@@ -24784,8 +26718,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -28066,7 +28477,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'
-@@ -24826,24 +26755,36 @@
+@@ -24823,24 +26756,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28111,7 +28522,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24853,10 +26794,11 @@
+@@ -24850,10 +26795,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28121,11 +28532,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
-@@ -24869,8 +26811,8 @@
+@@ -24866,8 +26812,8 @@
fi
@@ -28136,7 +28547,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24897,8 +26839,8 @@
+@@ -24894,8 +26840,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -28147,7 +28558,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24911,40 +26853,52 @@
+@@ -24908,40 +26854,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28212,7 +28623,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24953,27 +26907,28 @@
+@@ -24950,27 +26908,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28221,7 +28632,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
@@ -28251,7 +28662,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24986,40 +26941,52 @@
+@@ -24983,40 +26942,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28316,7 +28727,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25028,22 +26995,23 @@
+@@ -25025,22 +26996,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28325,7 +28736,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
@@ -28346,7 +28757,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25054,36 +27022,49 @@
+@@ -25051,36 +27023,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28406,7 +28817,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25092,20 +27073,21 @@
+@@ -25089,23 +27074,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28424,22 +28835,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.
-@@ -25118,10 +27100,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
+@@ -25115,10 +27100,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28448,7 +28866,7 @@
test_array [0] = 0
;
-@@ -25129,24 +27112,36 @@
+@@ -25126,24 +27113,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28493,11 +28911,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25159,10 +27154,11 @@
+@@ -25156,10 +27155,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28506,7 +28925,7 @@
test_array [0] = 0
;
-@@ -25170,24 +27166,36 @@
+@@ -25167,24 +27168,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28551,7 +28970,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25196,30 +27204,32 @@
+@@ -25193,30 +27206,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28584,7 +29003,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28593,7 +29013,7 @@
test_array [0] = 0
;
-@@ -25227,24 +27237,36 @@
+@@ -25224,24 +27240,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28638,11 +29058,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25257,10 +27279,11 @@
+@@ -25254,10 +27282,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28651,7 +29072,7 @@
test_array [0] = 0
;
-@@ -25268,24 +27291,36 @@
+@@ -25265,24 +27295,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28696,7 +29117,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25294,24 +27329,27 @@
+@@ -25291,24 +27333,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28734,11 +29155,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`
-@@ -25322,10 +27360,11 @@
+@@ -25319,10 +27364,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -28747,7 +29169,7 @@
test_array [0] = 0
;
-@@ -25333,24 +27372,36 @@
+@@ -25330,24 +27377,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -28792,7 +29214,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25359,26 +27410,20 @@
+@@ -25356,26 +27415,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28806,13 +29228,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
@@ -28825,19 +29251,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25386,8 +27431,9 @@
+@@ -25383,8 +27440,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
-@@ -25396,35 +27442,44 @@
+@@ -25393,35 +27452,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -28895,12 +29322,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25435,28 +27490,27 @@
+@@ -25432,28 +27500,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)
@@ -28909,18 +29337,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
@@ -28932,7 +29366,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25467,36 +27521,49 @@
+@@ -25464,36 +27535,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28992,7 +29426,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25505,20 +27572,21 @@
+@@ -25502,23 +27586,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29010,22 +29444,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.
-@@ -25531,10 +27599,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
+@@ -25528,10 +27612,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29034,7 +29475,7 @@
test_array [0] = 0
;
-@@ -25542,24 +27611,36 @@
+@@ -25539,24 +27625,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29079,11 +29520,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25572,10 +27653,11 @@
+@@ -25569,10 +27667,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29092,7 +29534,7 @@
test_array [0] = 0
;
-@@ -25583,24 +27665,36 @@
+@@ -25580,24 +27680,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29137,7 +29579,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25609,30 +27703,32 @@
+@@ -25606,30 +27718,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29170,7 +29612,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29179,7 +29622,7 @@
test_array [0] = 0
;
-@@ -25640,24 +27736,36 @@
+@@ -25637,24 +27752,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29224,11 +29667,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25670,10 +27778,11 @@
+@@ -25667,10 +27794,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29237,7 +29681,7 @@
test_array [0] = 0
;
-@@ -25681,24 +27790,36 @@
+@@ -25678,24 +27807,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29282,7 +29726,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25707,24 +27828,27 @@
+@@ -25704,24 +27845,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29320,11 +29764,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`
-@@ -25735,10 +27859,11 @@
+@@ -25732,10 +27876,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -29333,7 +29778,7 @@
test_array [0] = 0
;
-@@ -25746,24 +27871,36 @@
+@@ -25743,24 +27889,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29378,7 +29823,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25772,25 +27909,19 @@
+@@ -25769,26 +27927,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29392,38 +29837,43 @@
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
--See \`config.log' for more details." >&5
++'') 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
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
--esac
--else
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi ;;
+ esac
+ else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
+-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-+echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
+-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-+ { (exit 77); exit 77; }; } ;;
-+esac
- else
+-else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25799,8 +27930,9 @@
+ _ACEOF
+@@ -25796,8 +27952,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
-@@ -25809,35 +27941,44 @@
+@@ -25806,35 +27964,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -29481,12 +29931,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25848,28 +27989,27 @@
+@@ -25845,28 +28012,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)
@@ -29495,18 +29946,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
@@ -29518,7 +29975,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25880,36 +28020,49 @@
+@@ -25877,36 +28047,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29578,7 +30035,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25918,20 +28071,21 @@
+@@ -25915,23 +28098,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29596,22 +30053,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.
-@@ -25944,10 +28098,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
+@@ -25941,10 +28124,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29620,7 +30084,7 @@
test_array [0] = 0
;
-@@ -25955,24 +28110,36 @@
+@@ -25952,24 +28137,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29665,11 +30129,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25985,10 +28152,11 @@
+@@ -25982,10 +28179,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29678,7 +30143,7 @@
test_array [0] = 0
;
-@@ -25996,24 +28164,36 @@
+@@ -25993,24 +28192,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29723,7 +30188,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26022,30 +28202,32 @@
+@@ -26019,30 +28230,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29756,7 +30221,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29765,7 +30231,7 @@
test_array [0] = 0
;
-@@ -26053,24 +28235,36 @@
+@@ -26050,24 +28264,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29810,11 +30276,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26083,10 +28277,11 @@
+@@ -26080,10 +28306,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29823,7 +30290,7 @@
test_array [0] = 0
;
-@@ -26094,24 +28289,36 @@
+@@ -26091,24 +28319,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29868,7 +30335,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26120,24 +28327,27 @@
+@@ -26117,24 +28357,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29906,11 +30373,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`
-@@ -26148,10 +28358,11 @@
+@@ -26145,10 +28388,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -29919,7 +30387,7 @@
test_array [0] = 0
;
-@@ -26159,24 +28370,36 @@
+@@ -26156,24 +28401,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29964,7 +30432,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26185,26 +28408,20 @@
+@@ -26182,26 +28439,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29978,13 +30446,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
@@ -29997,19 +30469,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26212,8 +28429,9 @@
+@@ -26209,8 +28464,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
-@@ -26222,35 +28440,44 @@
+@@ -26219,35 +28476,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30067,12 +30540,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26261,28 +28488,27 @@
+@@ -26258,28 +28524,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)
@@ -30081,18 +30555,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
@@ -30104,7 +30584,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26293,36 +28519,49 @@
+@@ -26290,36 +28559,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30164,7 +30644,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26331,20 +28570,21 @@
+@@ -26328,23 +28610,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30182,22 +30662,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.
-@@ -26357,10 +28597,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
+@@ -26354,10 +28636,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30206,7 +30693,7 @@
test_array [0] = 0
;
-@@ -26368,24 +28609,36 @@
+@@ -26365,24 +28649,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30251,11 +30738,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26398,10 +28651,11 @@
+@@ -26395,10 +28691,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30264,7 +30752,7 @@
test_array [0] = 0
;
-@@ -26409,24 +28663,36 @@
+@@ -26406,24 +28704,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30309,7 +30797,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26435,30 +28701,32 @@
+@@ -26432,30 +28742,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30342,7 +30830,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30351,7 +30840,7 @@
test_array [0] = 0
;
-@@ -26466,24 +28734,36 @@
+@@ -26463,24 +28776,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30396,11 +30885,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26496,10 +28776,11 @@
+@@ -26493,10 +28818,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30409,7 +30899,7 @@
test_array [0] = 0
;
-@@ -26507,24 +28788,36 @@
+@@ -26504,24 +28831,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30454,7 +30944,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26533,24 +28826,27 @@
+@@ -26530,24 +28869,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30492,11 +30982,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`
-@@ -26561,10 +28857,11 @@
+@@ -26558,10 +28900,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -30505,7 +30996,7 @@
test_array [0] = 0
;
-@@ -26572,24 +28869,36 @@
+@@ -26569,24 +28913,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30550,7 +31041,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26598,26 +28907,20 @@
+@@ -26595,26 +28951,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30564,13 +31055,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
@@ -30583,19 +31078,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26625,8 +28928,9 @@
+@@ -26622,8 +28976,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
-@@ -26635,35 +28939,44 @@
+@@ -26632,35 +28988,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30653,12 +31149,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26674,30 +28987,29 @@
+@@ -26671,30 +29036,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 *)
@@ -30667,18 +31164,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
@@ -30692,7 +31195,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26710,40 +29022,52 @@
+@@ -26707,40 +29075,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30757,7 +31260,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26752,14 +29076,15 @@
+@@ -26749,14 +29129,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30766,7 +31269,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
@@ -30777,7 +31280,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26768,8 +29093,8 @@
+@@ -26765,8 +29146,8 @@
fi
@@ -30788,7 +31291,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26782,40 +29107,52 @@
+@@ -26779,40 +29160,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -30853,7 +31356,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26824,14 +29161,15 @@
+@@ -26821,14 +29214,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30862,7 +31365,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
@@ -30873,7 +31376,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26845,8 +29183,8 @@
+@@ -26842,8 +29236,8 @@
@@ -30884,7 +31387,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26857,36 +29195,49 @@
+@@ -26854,36 +29248,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30944,7 +31447,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26895,20 +29246,21 @@
+@@ -26892,23 +29299,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30962,22 +31465,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.
-@@ -26921,10 +29273,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
+@@ -26918,10 +29325,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 ()
{
@@ -30986,7 +31496,7 @@
test_array [0] = 0
;
-@@ -26932,24 +29285,36 @@
+@@ -26929,24 +29338,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31031,11 +31541,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26962,10 +29327,11 @@
+@@ -26959,10 +29380,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 ()
{
@@ -31044,7 +31555,7 @@
test_array [0] = 0
;
-@@ -26973,24 +29339,36 @@
+@@ -26970,24 +29393,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31089,7 +31600,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26999,30 +29377,32 @@
+@@ -26996,30 +29431,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31122,7 +31633,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 ()
{
@@ -31131,7 +31643,7 @@
test_array [0] = 0
;
-@@ -27030,24 +29410,36 @@
+@@ -27027,24 +29465,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31176,11 +31688,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27060,10 +29452,11 @@
+@@ -27057,10 +29507,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 ()
{
@@ -31189,7 +31702,7 @@
test_array [0] = 0
;
-@@ -27071,24 +29464,36 @@
+@@ -27068,24 +29520,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31234,7 +31747,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27097,24 +29502,27 @@
+@@ -27094,24 +29558,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31272,11 +31785,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`
-@@ -27125,10 +29533,11 @@
+@@ -27122,10 +29589,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 ()
{
@@ -31285,7 +31799,7 @@
test_array [0] = 0
;
-@@ -27136,24 +29545,36 @@
+@@ -27133,24 +29602,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31330,7 +31844,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27162,26 +29583,20 @@
+@@ -27159,26 +29640,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31344,13 +31858,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
@@ -31363,19 +31881,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27189,8 +29604,9 @@
+@@ -27186,8 +29665,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
-@@ -27199,35 +29615,44 @@
+@@ -27196,35 +29677,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31433,12 +31952,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27238,29 +29663,28 @@
+@@ -27235,29 +29725,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)
@@ -31447,18 +31967,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
@@ -31471,7 +31997,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27271,36 +29695,49 @@
+@@ -27268,36 +29761,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31531,7 +32057,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27309,20 +29746,21 @@
+@@ -27306,23 +29812,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31549,22 +32075,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.
-@@ -27335,10 +29773,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
+@@ -27332,10 +29838,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 ()
{
@@ -31573,7 +32106,7 @@
test_array [0] = 0
;
-@@ -27346,24 +29785,36 @@
+@@ -27343,24 +29851,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31618,11 +32151,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27376,10 +29827,11 @@
+@@ -27373,10 +29893,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 ()
{
@@ -31631,7 +32165,7 @@
test_array [0] = 0
;
-@@ -27387,24 +29839,36 @@
+@@ -27384,24 +29906,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31676,7 +32210,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27413,30 +29877,32 @@
+@@ -27410,30 +29944,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31709,7 +32243,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 ()
{
@@ -31718,7 +32253,7 @@
test_array [0] = 0
;
-@@ -27444,24 +29910,36 @@
+@@ -27441,24 +29978,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31763,11 +32298,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27474,10 +29952,11 @@
+@@ -27471,10 +30020,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 ()
{
@@ -31776,7 +32312,7 @@
test_array [0] = 0
;
-@@ -27485,24 +29964,36 @@
+@@ -27482,24 +30033,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31821,7 +32357,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27511,24 +30002,27 @@
+@@ -27508,24 +30071,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31859,11 +32395,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`
-@@ -27539,10 +30033,11 @@
+@@ -27536,10 +30102,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 ()
{
@@ -31872,7 +32409,7 @@
test_array [0] = 0
;
-@@ -27550,24 +30045,36 @@
+@@ -27547,24 +30115,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31917,7 +32454,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27576,26 +30083,20 @@
+@@ -27573,26 +30153,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31931,13 +32468,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
@@ -31950,19 +32491,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27603,8 +30104,9 @@
+@@ -27600,8 +30178,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
-@@ -27613,35 +30115,44 @@
+@@ -27610,35 +30190,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32020,12 +32562,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27652,30 +30163,29 @@
+@@ -27649,30 +30238,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)
@@ -32034,18 +32577,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
@@ -32059,7 +32608,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27696,36 +30206,48 @@
+@@ -27693,36 +30285,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32120,7 +32669,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!
-@@ -27737,18 +30259,18 @@
+@@ -27734,18 +30338,18 @@
{ (exit 1); exit 1; }; }
fi
@@ -32144,7 +32693,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'
-@@ -27778,24 +30300,36 @@
+@@ -27775,24 +30379,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32189,7 +32738,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27804,9 +30338,10 @@
+@@ -27801,9 +30417,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32198,11 +32747,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
-@@ -27819,26 +30354,26 @@
+@@ -27816,26 +30433,26 @@
fi
@@ -32239,7 +32788,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27857,18 +30392,19 @@
+@@ -27854,18 +30471,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32267,7 +32816,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27879,24 +30415,36 @@
+@@ -27876,24 +30494,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -32312,7 +32861,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27905,15 +30453,16 @@
+@@ -27902,15 +30532,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32335,7 +32884,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27922,8 +30471,13 @@
+@@ -27919,8 +30550,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -32351,7 +32900,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27947,9 +30501,10 @@
+@@ -27944,9 +30580,10 @@
ac_header_preproc=no
fi
@@ -32364,7 +32913,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27973,25 +30528,19 @@
+@@ -27970,25 +30607,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;}
@@ -32397,7 +32946,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28003,8 +30552,8 @@
+@@ -28000,8 +30631,8 @@
done
@@ -32408,7 +32957,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28031,53 +30580,59 @@
+@@ -28028,53 +30659,59 @@
#undef _NSGetEnviron
@@ -32487,7 +33036,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28086,13 +30641,14 @@
+@@ -28083,13 +30720,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32496,7 +33045,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
@@ -32506,7 +33055,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28113,9 +30669,9 @@
+@@ -28110,9 +30748,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32519,7 +33068,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28141,53 +30697,59 @@
+@@ -28138,53 +30776,59 @@
#undef $ac_func
@@ -32598,7 +33147,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28196,13 +30758,15 @@
+@@ -28193,13 +30837,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32607,7 +33156,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
@@ -32618,7 +33167,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28219,32 +30783,32 @@
+@@ -28216,32 +30862,32 @@
@@ -32663,7 +33212,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28260,8 +30824,8 @@
+@@ -28257,8 +30903,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -32674,7 +33223,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28298,8 +30862,13 @@
+@@ -28295,8 +30941,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -32690,7 +33239,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28366,6 +30935,7 @@
+@@ -28363,6 +31014,7 @@
fi
done
fi
@@ -32698,7 +33247,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28395,24 +30965,36 @@
+@@ -28392,24 +31044,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32743,7 +33292,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28423,7 +31005,7 @@
+@@ -28420,7 +31084,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32752,17 +33301,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}/` \
-@@ -28471,7 +31053,8 @@
+@@ -28468,7 +31132,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
-@@ -28481,21 +31064,26 @@
+@@ -28478,21 +31143,26 @@
*-*-solaris*)
;;
*)
@@ -32797,7 +33346,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28503,7 +31091,7 @@
+@@ -28500,7 +31170,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
@@ -32806,7 +33355,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28512,7 +31100,7 @@
+@@ -28509,7 +31179,7 @@
esac
fi
cd ..
@@ -32815,7 +33364,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28556,12 +31144,12 @@
+@@ -28553,12 +31223,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -32832,7 +33381,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28589,8 +31177,8 @@
+@@ -28586,8 +31256,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.
@@ -32843,7 +33392,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28603,40 +31191,52 @@
+@@ -28600,40 +31270,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32908,7 +33457,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28645,14 +31245,15 @@
+@@ -28642,14 +31324,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32917,7 +33466,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
@@ -32928,7 +33477,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28661,8 +31262,8 @@
+@@ -28658,8 +31341,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -32939,7 +33488,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28696,24 +31297,36 @@
+@@ -28693,24 +31376,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32984,7 +33533,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28722,10 +31335,11 @@
+@@ -28719,10 +31414,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32994,11 +33543,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
-@@ -28734,8 +31348,8 @@
+@@ -28731,8 +31427,8 @@
fi
@@ -33009,7 +33558,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28881,8 +31495,8 @@
+@@ -28878,8 +31574,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33020,7 +33569,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28893,9 +31507,9 @@
+@@ -28890,9 +31586,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33033,7 +33582,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28907,40 +31521,52 @@
+@@ -28904,40 +31600,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33098,7 +33647,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28949,14 +31575,16 @@
+@@ -28946,14 +31654,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33107,7 +33656,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
@@ -33119,7 +33668,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28969,8 +31597,8 @@
+@@ -28966,8 +31676,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -33130,7 +33679,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28983,40 +31611,52 @@
+@@ -28980,40 +31690,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -33195,7 +33744,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29025,14 +31665,15 @@
+@@ -29022,14 +31744,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33204,7 +33753,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
@@ -33215,7 +33764,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29040,8 +31681,8 @@
+@@ -29037,8 +31760,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -33226,7 +33775,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29060,40 +31701,53 @@
+@@ -29057,40 +31780,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33289,11 +33838,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
-@@ -29108,16 +31762,15 @@
+@@ -29105,16 +31841,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -33314,7 +33863,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'
-@@ -29144,24 +31797,36 @@
+@@ -29141,24 +31876,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33359,7 +33908,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29170,8 +31835,10 @@
+@@ -29167,8 +31914,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33367,11 +33916,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
-@@ -29184,13 +31851,13 @@
+@@ -29181,13 +31930,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33389,7 +33938,7 @@
:
fi
-@@ -29202,16 +31869,15 @@
+@@ -29199,16 +31948,15 @@
case $host_os in
solaris*)
@@ -33410,7 +33959,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'
-@@ -29238,24 +31904,36 @@
+@@ -29235,24 +31983,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33455,7 +34004,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29264,8 +31942,10 @@
+@@ -29261,8 +32021,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33463,11 +34012,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
-@@ -29278,13 +31958,13 @@
+@@ -29275,13 +32037,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33485,7 +34034,7 @@
:
fi
-@@ -29311,17 +31991,17 @@
+@@ -29308,17 +32070,17 @@
@@ -33509,7 +34058,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29339,21 +32019,21 @@
+@@ -29336,21 +32098,21 @@
fi
@@ -33539,7 +34088,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29372,14 +32052,14 @@
+@@ -29369,14 +32131,14 @@
@@ -33558,7 +34107,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29413,24 +32093,36 @@
+@@ -29410,24 +32172,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33603,7 +34152,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29439,9 +32131,10 @@
+@@ -29436,9 +32210,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33612,11 +34161,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"
-@@ -29454,8 +32147,8 @@
+@@ -29451,8 +32226,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -33627,7 +34176,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29475,8 +32168,8 @@
+@@ -29472,8 +32247,8 @@
@@ -33638,7 +34187,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29512,24 +32205,36 @@
+@@ -29509,24 +32284,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33683,7 +34232,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29538,10 +32243,11 @@
+@@ -29535,10 +32322,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33693,11 +34242,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"
-@@ -29555,19 +32261,19 @@
+@@ -29552,19 +32340,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -33723,7 +34272,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29600,24 +32306,36 @@
+@@ -29597,24 +32385,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33768,7 +34317,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29626,9 +32344,10 @@
+@@ -29623,9 +32423,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33777,11 +34326,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"
-@@ -29638,14 +32357,14 @@
+@@ -29635,14 +32436,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -33802,7 +34351,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29678,24 +32397,36 @@
+@@ -29675,24 +32476,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33847,7 +34396,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29704,9 +32435,10 @@
+@@ -29701,9 +32514,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33856,11 +34405,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"
-@@ -29716,11 +32448,11 @@
+@@ -29713,11 +32527,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -33876,16 +34425,16 @@
LIBJPEG=
-@@ -29740,7 +32472,7 @@
+@@ -29737,7 +32551,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29743: $i/$j" >&5
-+ echo "configure: 32475: $i/$j" >&5
+- echo "configure: 29740: $i/$j" >&5
++ echo "configure: 32554: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29787,14 +32519,14 @@
+@@ -29784,14 +32598,14 @@
@@ -33903,7 +34452,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29837,8 +32569,8 @@
+@@ -29834,8 +32648,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33914,7 +34463,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29847,8 +32579,8 @@
+@@ -29844,8 +32658,8 @@
{ (exit 1); exit 1; }; }
else
@@ -33925,7 +34474,7 @@
PERL=$kde_cv_path
fi
-@@ -29862,10 +32594,9 @@
+@@ -29859,10 +32673,9 @@
@@ -33938,7 +34487,7 @@
else
if test $kde_qtver = 3; then
-@@ -29875,7 +32606,8 @@
+@@ -29872,7 +32685,8 @@
fi
@@ -33948,7 +34497,7 @@
USING_QT_MT=""
-@@ -29895,13 +32627,13 @@
+@@ -29892,13 +32706,13 @@
else
kde_check_threading_default=yes
fi
@@ -33966,7 +34515,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29973,8 +32705,8 @@
+@@ -29970,8 +32784,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -33977,7 +34526,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"
-@@ -29983,34 +32715,34 @@
+@@ -29980,34 +32794,34 @@
qt_libraries=""
qt_includes=""
@@ -34024,16 +34573,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30038,7 +32770,7 @@
+@@ -30035,7 +32849,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 30041: $i/$j" >&5
-+ echo "configure: 32773: $i/$j" >&5
+- echo "configure: 30038: $i/$j" >&5
++ echo "configure: 32852: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30075,8 +32807,7 @@
+@@ -30072,8 +32886,7 @@
ac_qt_libraries="$qt_libdir"
@@ -34043,7 +34592,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'
-@@ -30213,13 +32944,13 @@
+@@ -30210,13 +33023,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -34061,7 +34610,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30228,15 +32959,14 @@
+@@ -30225,15 +33038,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -34080,7 +34629,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'
-@@ -30357,12 +33087,12 @@
+@@ -30354,12 +33166,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -34097,7 +34646,7 @@
fi
-@@ -30400,14 +33130,14 @@
+@@ -30397,14 +33209,14 @@
fi
@@ -34115,7 +34664,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30450,8 +33180,8 @@
+@@ -30447,8 +33259,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34126,7 +34675,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30472,22 +33202,22 @@
+@@ -30469,22 +33281,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34154,7 +34703,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30530,12 +33260,12 @@
+@@ -30527,12 +33339,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34171,7 +34720,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30565,10 +33295,10 @@
+@@ -30562,10 +33374,10 @@
if test $kde_qtver = 3; then
@@ -34185,7 +34734,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30591,22 +33321,22 @@
+@@ -30588,22 +33400,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34215,7 +34764,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30629,13 +33359,13 @@
+@@ -30626,13 +33438,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34233,7 +34782,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30666,15 +33396,14 @@
+@@ -30663,15 +33475,14 @@
if test -n "$LIBJPEG"; then
@@ -34252,7 +34801,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'
-@@ -30707,24 +33436,36 @@
+@@ -30704,24 +33515,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34297,7 +34846,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30733,9 +33474,10 @@
+@@ -30730,9 +33553,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34306,11 +34855,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"
-@@ -30751,12 +33493,12 @@
+@@ -30748,12 +33572,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34327,7 +34876,7 @@
LIBJPEG_QT=
fi
-@@ -30787,15 +33529,15 @@
+@@ -30784,15 +33608,15 @@
@@ -34349,7 +34898,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30819,11 +33561,11 @@
+@@ -30816,11 +33640,11 @@
@@ -34365,34 +34914,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30875,7 +33617,7 @@
+@@ -30872,7 +33696,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30878: $i/$j" >&5
-+ echo "configure: 33620: $i/$j" >&5
+- echo "configure: 30875: $i/$j" >&5
++ echo "configure: 33699: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30905,7 +33647,7 @@
+@@ -30902,7 +33726,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30908: $i/$j" >&5
-+ echo "configure: 33650: $i/$j" >&5
+- echo "configure: 30905: $i/$j" >&5
++ echo "configure: 33729: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30923,7 +33665,7 @@
+@@ -30920,7 +33744,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30926: $i/$j" >&5
-+ echo "configure: 33668: $i/$j" >&5
+- echo "configure: 30923: $i/$j" >&5
++ echo "configure: 33747: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30982,12 +33724,12 @@
+@@ -30979,12 +33803,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34409,7 +34958,7 @@
fi
kde_libraries="${libdir}"
-@@ -30996,8 +33738,8 @@
+@@ -30993,8 +33817,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34420,7 +34969,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31035,8 +33777,8 @@
+@@ -31032,8 +33856,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -34431,7 +34980,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31079,8 +33821,8 @@
+@@ -31076,8 +33900,8 @@
fi
@@ -34442,7 +34991,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31112,10 +33854,9 @@
+@@ -31109,10 +33933,9 @@
@@ -34455,7 +35004,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31129,13 +33870,14 @@
+@@ -31126,13 +33949,14 @@
fi
@@ -34473,7 +35022,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31246,15 +33988,14 @@
+@@ -31243,15 +34067,14 @@
else
if test $kde_qtver = 1; then
@@ -34494,7 +35043,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'
-@@ -31306,8 +34047,8 @@
+@@ -31303,8 +34126,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34505,7 +35054,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.
-@@ -31346,8 +34087,8 @@
+@@ -31343,8 +34166,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34516,7 +35065,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
-@@ -31355,8 +34096,8 @@
+@@ -31352,8 +34175,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34527,7 +35076,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
-@@ -31549,15 +34290,14 @@
+@@ -31546,15 +34369,14 @@
else
if test $kde_qtver = 1; then
@@ -34548,7 +35097,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'
-@@ -31609,8 +34349,8 @@
+@@ -31606,8 +34428,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -34559,7 +35108,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.
-@@ -31649,8 +34389,8 @@
+@@ -31646,8 +34468,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -34570,7 +35119,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
-@@ -31658,8 +34398,8 @@
+@@ -31655,8 +34477,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -34581,7 +35130,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
-@@ -31751,22 +34491,22 @@
+@@ -31748,22 +34570,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -34610,7 +35159,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31799,14 +34539,14 @@
+@@ -31796,14 +34618,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -34628,7 +35177,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31849,8 +34589,8 @@
+@@ -31846,8 +34668,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34639,7 +35188,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31861,21 +34601,21 @@
+@@ -31858,21 +34680,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34666,7 +35215,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31918,8 +34658,8 @@
+@@ -31915,8 +34737,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34677,7 +35226,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31930,22 +34670,22 @@
+@@ -31927,22 +34749,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34705,7 +35254,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31988,8 +34728,8 @@
+@@ -31985,8 +34807,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34716,7 +35265,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -32002,21 +34742,21 @@
+@@ -31999,21 +34821,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34743,7 +35292,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32059,8 +34799,8 @@
+@@ -32056,8 +34878,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34754,7 +35303,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32073,22 +34813,22 @@
+@@ -32070,22 +34892,22 @@
{ (exit 1); exit 1; }; }
else
@@ -34782,7 +35331,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32131,12 +34871,12 @@
+@@ -32128,12 +34950,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34799,7 +35348,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32165,14 +34905,14 @@
+@@ -32162,14 +34984,14 @@
if test -n "$kde32ornewer"; then
@@ -34817,7 +35366,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32215,8 +34955,8 @@
+@@ -32212,8 +35034,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34828,7 +35377,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32227,21 +34967,21 @@
+@@ -32224,21 +35046,21 @@
{ (exit 1); exit 1; }; }
else
@@ -34855,7 +35404,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32284,8 +35024,8 @@
+@@ -32281,8 +35103,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34866,7 +35415,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32296,8 +35036,8 @@
+@@ -32293,8 +35115,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34877,7 +35426,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32305,14 +35045,14 @@
+@@ -32302,14 +35124,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -34895,7 +35444,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32355,8 +35095,8 @@
+@@ -32352,8 +35174,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34906,7 +35455,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32367,8 +35107,8 @@
+@@ -32364,8 +35186,8 @@
{ (exit 1); exit 1; }; }
else
@@ -34917,7 +35466,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32376,14 +35116,14 @@
+@@ -32373,14 +35195,14 @@
fi
@@ -34935,7 +35484,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32426,12 +35166,12 @@
+@@ -32423,12 +35245,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34952,16 +35501,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32446,7 +35186,7 @@
+@@ -32443,7 +35265,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32449: $i/$j" >&5
-+ echo "configure: 35189: $i/$j" >&5
+- echo "configure: 32446: $i/$j" >&5
++ echo "configure: 35268: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32608,13 +35348,12 @@
+@@ -32605,13 +35427,12 @@
@@ -34978,7 +35527,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'
-@@ -32635,13 +35374,13 @@
+@@ -32632,13 +35453,13 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "GCC visibility push" >/dev/null 2>&1; then
@@ -34996,7 +35545,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
-@@ -32661,16 +35400,15 @@
+@@ -32658,16 +35479,15 @@
kde_have_gcc_visibility=no
@@ -35017,7 +35566,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'
-@@ -32697,24 +35435,36 @@
+@@ -32694,24 +35514,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35062,7 +35611,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32723,8 +35473,10 @@
+@@ -32720,8 +35552,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35070,11 +35619,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
-@@ -32737,28 +35489,27 @@
+@@ -32734,28 +35568,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35112,7 +35661,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'
-@@ -32793,24 +35544,36 @@
+@@ -32790,24 +35623,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -35157,7 +35706,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32819,9 +35582,10 @@
+@@ -32816,9 +35661,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35170,7 +35719,7 @@
CXXFLAGS=$safe_CXXFLAGS
ac_ext=c
-@@ -32833,21 +35597,20 @@
+@@ -32830,21 +35676,20 @@
fi
@@ -35197,7 +35746,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'
-@@ -32887,24 +35650,36 @@
+@@ -32884,24 +35729,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35242,7 +35791,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32913,9 +35688,10 @@
+@@ -32910,9 +35767,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35251,11 +35800,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
-@@ -32929,8 +35705,8 @@
+@@ -32926,8 +35784,8 @@
fi
@@ -35266,7 +35815,7 @@
if test x$kde_cv_val_gcc_visibility_bug = xno; then
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32946,8 +35722,8 @@
+@@ -32943,8 +35801,8 @@
fi
else
@@ -35277,7 +35826,7 @@
:
fi
-@@ -32960,10 +35736,9 @@
+@@ -32957,10 +35815,9 @@
want_pam=
@@ -35290,7 +35839,7 @@
want_pam=yes
pam_service=kde
elif test "x$withval" = "xno"; then
-@@ -32975,13 +35750,14 @@
+@@ -32972,13 +35829,14 @@
else
pam_service=kde
@@ -35308,7 +35857,7 @@
if test "${ac_cv_lib_pam_pam_start+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32994,40 +35770,52 @@
+@@ -32991,40 +35849,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35373,7 +35922,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33036,28 +35824,29 @@
+@@ -33033,28 +35903,29 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35382,7 +35931,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
@@ -35413,7 +35962,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33068,24 +35857,36 @@
+@@ -33065,24 +35936,36 @@
#include <security/pam_appl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -35458,7 +36007,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33094,15 +35895,16 @@
+@@ -33091,15 +35974,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35481,7 +36030,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33111,8 +35913,13 @@
+@@ -33108,8 +35992,13 @@
/* end confdefs.h. */
#include <security/pam_appl.h>
_ACEOF
@@ -35497,7 +36046,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33136,9 +35943,10 @@
+@@ -33133,9 +36022,10 @@
ac_header_preproc=no
fi
@@ -35510,7 +36059,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33162,42 +35970,35 @@
+@@ -33159,42 +36049,35 @@
echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -35564,7 +36113,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33208,24 +36009,36 @@
+@@ -33205,24 +36088,36 @@
#include <pam/pam_appl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -35609,7 +36158,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33234,15 +36047,16 @@
+@@ -33231,15 +36126,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35632,7 +36181,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33251,8 +36065,13 @@
+@@ -33248,8 +36144,13 @@
/* end confdefs.h. */
#include <pam/pam_appl.h>
_ACEOF
@@ -35648,7 +36197,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33276,9 +36095,10 @@
+@@ -33273,9 +36174,10 @@
ac_header_preproc=no
fi
@@ -35661,7 +36210,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33302,25 +36122,18 @@
+@@ -33299,25 +36201,18 @@
echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -35692,7 +36241,7 @@
fi
if test $ac_cv_header_pam_pam_appl_h = yes; then
-@@ -33367,8 +36180,8 @@
+@@ -33364,8 +36259,8 @@
fi
@@ -35703,7 +36252,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33391,11 +36204,11 @@
+@@ -33388,11 +36283,11 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "const struct pam_message" >/dev/null 2>&1; then
@@ -35719,7 +36268,7 @@
cat >>confdefs.h <<\_ACEOF
#define PAM_MESSAGE_NONCONST 1
-@@ -33406,8 +36219,8 @@
+@@ -33403,8 +36298,8 @@
rm -f conftest*
else
@@ -35730,7 +36279,7 @@
fi
rm -f conftest*
-@@ -33419,8 +36232,8 @@
+@@ -33416,8 +36311,8 @@
@@ -35741,7 +36290,7 @@
if test "${ac_cv_lib_shadow_getspent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33433,40 +36246,52 @@
+@@ -33430,40 +36325,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35806,7 +36355,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33475,21 +36300,22 @@
+@@ -33472,21 +36379,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35815,7 +36364,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
@@ -35835,7 +36384,7 @@
if test "${ac_cv_lib_gen_getspent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33502,40 +36328,52 @@
+@@ -33499,40 +36407,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -35900,7 +36449,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33544,21 +36382,22 @@
+@@ -33541,21 +36461,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35909,7 +36458,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
@@ -35929,7 +36478,7 @@
if test "${ac_cv_func_getspent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33585,53 +36424,59 @@
+@@ -33582,53 +36503,59 @@
#undef getspent
@@ -36008,7 +36557,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33640,13 +36485,14 @@
+@@ -33637,13 +36564,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36017,7 +36566,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_getspent" >&5
@@ -36027,7 +36576,7 @@
if test $ac_cv_func_getspent = yes; then
ac_use_shadow=yes
else
-@@ -33662,14 +36508,13 @@
+@@ -33659,14 +36587,13 @@
@@ -36046,7 +36595,7 @@
use_shadow=yes
else
use_shadow=no
-@@ -33679,19 +36524,20 @@
+@@ -33676,19 +36603,20 @@
use_shadow="$ac_use_shadow"
@@ -36072,7 +36621,7 @@
LIBSHADOW=
LIBGEN=
fi
-@@ -33731,10 +36577,9 @@
+@@ -33728,10 +36656,9 @@
@@ -36085,7 +36634,7 @@
KDM_PAM_SERVICE=$withval
else
{ { echo "$as_me:$LINENO: error: Cannot use use --with-kdm-pam, as no PAM was detected.
-@@ -33749,10 +36594,11 @@
+@@ -33746,10 +36673,11 @@
KDM_PAM_SERVICE="$pam_service"
fi
@@ -36100,7 +36649,7 @@
cat >>confdefs.h <<_ACEOF
#define KDM_PAM_SERVICE "$KDM_PAM_SERVICE"
-@@ -33763,10 +36609,9 @@
+@@ -33760,10 +36688,9 @@
@@ -36113,7 +36662,7 @@
KCHECKPASS_PAM_SERVICE=$withval
else
{ { echo "$as_me:$LINENO: error: Cannot use use --with-kcp-pam, as no PAM was detected.
-@@ -33781,10 +36626,11 @@
+@@ -33778,10 +36705,11 @@
KCHECKPASS_PAM_SERVICE="$pam_service"
fi
@@ -36128,7 +36677,7 @@
cat >>confdefs.h <<_ACEOF
#define KCHECKPASS_PAM_SERVICE "$KCHECKPASS_PAM_SERVICE"
-@@ -33795,10 +36641,9 @@
+@@ -33792,10 +36720,9 @@
@@ -36141,7 +36690,7 @@
KSCREENSAVER_PAM_SERVICE=$withval
else
{ { echo "$as_me:$LINENO: error: Cannot use use --with-kss-pam, as no PAM was detected.
-@@ -33813,10 +36658,11 @@
+@@ -33810,10 +36737,11 @@
KSCREENSAVER_PAM_SERVICE="$pam_service"
fi
@@ -36156,7 +36705,7 @@
cat >>confdefs.h <<_ACEOF
#define KSCREENSAVER_PAM_SERVICE "$KSCREENSAVER_PAM_SERVICE"
-@@ -33834,9 +36680,9 @@
+@@ -33831,9 +36759,9 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -36169,7 +36718,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -33858,24 +36704,36 @@
+@@ -33855,24 +36783,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36214,7 +36763,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33884,12 +36742,14 @@
+@@ -33881,12 +36821,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36233,7 +36782,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -33901,13 +36761,12 @@
+@@ -33898,13 +36840,12 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -36249,7 +36798,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33915,126 +36774,99 @@
+@@ -33912,126 +36853,99 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36385,7 +36934,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -36427,7 +36976,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34042,122 +36874,96 @@
+@@ -34039,122 +36953,96 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -36563,7 +37112,7 @@
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then
+ break
@@ -36601,7 +37150,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34181,24 +36987,36 @@
+@@ -34178,24 +37066,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36646,7 +37195,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34207,9 +37025,10 @@
+@@ -34204,9 +37104,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36659,7 +37208,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -34265,6 +37084,7 @@
+@@ -34262,6 +37163,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -36667,7 +37216,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -34284,18 +37104,27 @@
+@@ -34281,18 +37183,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -36701,7 +37250,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34308,12 +37137,14 @@
+@@ -34305,12 +37216,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -36719,7 +37268,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -34366,18 +37197,19 @@
+@@ -34363,18 +37276,19 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36747,7 +37296,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34388,24 +37220,36 @@
+@@ -34385,24 +37299,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -36792,7 +37341,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34414,15 +37258,16 @@
+@@ -34411,15 +37337,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36815,7 +37364,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34431,8 +37276,13 @@
+@@ -34428,8 +37355,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -36831,7 +37380,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34456,9 +37306,10 @@
+@@ -34453,9 +37385,10 @@
ac_header_preproc=no
fi
@@ -36844,7 +37393,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34482,25 +37333,19 @@
+@@ -34479,25 +37412,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;}
@@ -36877,7 +37426,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34513,17 +37358,17 @@
+@@ -34510,17 +37437,17 @@
done
if test "${ac_cv_header_pty_h+set}" = set; then
@@ -36901,7 +37450,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34534,24 +37379,36 @@
+@@ -34531,24 +37458,36 @@
#include <pty.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36946,7 +37495,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34560,15 +37417,16 @@
+@@ -34557,15 +37496,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36969,7 +37518,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34577,8 +37435,13 @@
+@@ -34574,8 +37514,13 @@
/* end confdefs.h. */
#include <pty.h>
_ACEOF
@@ -36985,7 +37534,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34602,9 +37465,10 @@
+@@ -34599,9 +37544,10 @@
ac_header_preproc=no
fi
@@ -36998,7 +37547,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34628,31 +37492,24 @@
+@@ -34625,31 +37571,24 @@
echo "$as_me: WARNING: pty.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: pty.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: pty.h: in the future, the compiler will take precedence" >&2;}
@@ -37037,7 +37586,7 @@
if test "${ac_cv_func_ptsname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34679,53 +37536,59 @@
+@@ -34676,53 +37615,59 @@
#undef ptsname
@@ -37116,7 +37665,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34734,18 +37597,19 @@
+@@ -34731,18 +37676,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37125,7 +37674,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_ptsname" >&5
@@ -37142,7 +37691,7 @@
if test "${ac_cv_lib_Alib_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34762,30 +37626,42 @@
+@@ -34759,30 +37705,42 @@
int
main ()
{
@@ -37194,7 +37743,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34794,21 +37670,22 @@
+@@ -34791,21 +37749,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37203,7 +37752,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
@@ -37223,7 +37772,7 @@
if test "${ac_cv_func_clnttcp_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34835,53 +37712,59 @@
+@@ -34832,53 +37791,59 @@
#undef clnttcp_create
@@ -37302,7 +37851,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34890,19 +37773,20 @@
+@@ -34887,19 +37852,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37311,7 +37860,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_clnttcp_create" >&5
@@ -37329,7 +37878,7 @@
if test "${ac_cv_lib_nsl_clnttcp_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34915,40 +37799,52 @@
+@@ -34912,40 +37878,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37394,7 +37943,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34957,14 +37853,15 @@
+@@ -34954,14 +37932,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37403,7 +37952,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
@@ -37414,7 +37963,7 @@
if test $ac_cv_lib_nsl_clnttcp_create = yes; then
LIBRPC="-lnsl"
fi
-@@ -34973,8 +37870,8 @@
+@@ -34970,8 +37949,8 @@
@@ -37425,7 +37974,7 @@
if test "${ac_cv_lib_ossaudio_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34991,30 +37888,42 @@
+@@ -34988,30 +37967,42 @@
int
main ()
{
@@ -37477,7 +38026,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35023,22 +37932,23 @@
+@@ -35020,22 +38011,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37486,7 +38035,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
@@ -37507,7 +38056,7 @@
if test "${ac_cv_lib_cfg_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35055,30 +37965,42 @@
+@@ -35052,30 +38044,42 @@
int
main ()
{
@@ -37559,7 +38108,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35087,20 +38009,21 @@
+@@ -35084,20 +38088,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37568,7 +38117,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
@@ -37587,7 +38136,7 @@
if test "${ac_cv_lib_odm_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35117,30 +38040,42 @@
+@@ -35114,30 +38119,42 @@
int
main ()
{
@@ -37639,7 +38188,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35149,14 +38084,15 @@
+@@ -35146,14 +38163,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37648,7 +38197,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
@@ -37659,7 +38208,7 @@
if test $ac_cv_lib_odm_main = yes; then
LIBODM="-lodm"
fi
-@@ -35164,8 +38100,8 @@
+@@ -35161,8 +38179,8 @@
kde_have_setupterm=yes
@@ -37670,7 +38219,7 @@
if test "${ac_cv_lib_curses_setupterm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35178,40 +38114,52 @@
+@@ -35175,40 +38193,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37735,7 +38284,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35220,19 +38168,20 @@
+@@ -35217,19 +38247,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37744,7 +38293,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
@@ -37762,7 +38311,7 @@
if test "${ac_cv_lib_ncurses_setupterm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35245,40 +38194,52 @@
+@@ -35242,40 +38273,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37827,7 +38376,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35287,19 +38248,20 @@
+@@ -35284,19 +38327,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37836,7 +38385,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
@@ -37854,7 +38403,7 @@
if test "${ac_cv_lib_mytinfo_setupterm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35312,40 +38274,52 @@
+@@ -35309,40 +38353,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37919,7 +38468,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35354,14 +38328,15 @@
+@@ -35351,14 +38407,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37928,7 +38477,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
@@ -37939,7 +38488,7 @@
if test $ac_cv_lib_mytinfo_setupterm = yes; then
LIBCURSES=-lmytinfo
else
-@@ -35383,8 +38358,8 @@
+@@ -35380,8 +38437,8 @@
fi
@@ -37950,7 +38499,7 @@
if test "${ac_cv_func_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35411,53 +38386,59 @@
+@@ -35408,53 +38465,59 @@
#undef res_init
@@ -38029,7 +38578,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35466,18 +38447,19 @@
+@@ -35463,18 +38526,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38038,7 +38587,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
@@ -38055,7 +38604,7 @@
if test "${ac_cv_lib_resolv_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35490,40 +38472,52 @@
+@@ -35487,40 +38551,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -38120,7 +38669,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35532,14 +38526,15 @@
+@@ -35529,14 +38605,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38129,7 +38678,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
@@ -38140,7 +38689,7 @@
if test $ac_cv_lib_resolv_res_init = yes; then
LIBRESOLV="-lresolv"
fi
-@@ -35548,7 +38543,7 @@
+@@ -35545,7 +38622,7 @@
@@ -38149,7 +38698,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'
-@@ -35557,8 +38552,8 @@
+@@ -35554,8 +38631,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -38160,7 +38709,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35582,24 +38577,36 @@
+@@ -35579,24 +38656,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38205,7 +38754,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35608,12 +38615,13 @@
+@@ -35605,12 +38694,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38223,7 +38772,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -35636,9 +38644,11 @@
+@@ -35633,9 +38723,11 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -38238,7 +38787,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -35648,13 +38658,27 @@
+@@ -35645,13 +38737,27 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <float.h>
@@ -38270,7 +38819,7 @@
test_array [0] = 0
;
-@@ -35662,48 +38686,70 @@
+@@ -35659,48 +38765,70 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38358,7 +38907,7 @@
if test "${ac_cv_type_uid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35725,8 +38771,8 @@
+@@ -35722,8 +38850,8 @@
rm -f conftest*
fi
@@ -38369,7 +38918,7 @@
if test $ac_cv_type_uid_t = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -35740,8 +38786,8 @@
+@@ -35737,8 +38865,8 @@
fi
@@ -38380,7 +38929,7 @@
if test "${ac_cv_type_getgroups+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35755,7 +38801,7 @@
+@@ -35752,7 +38880,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Thanks to Mike Rendell for this test. */
@@ -38389,7 +38938,7 @@
#define NGID 256
#undef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
-@@ -35765,7 +38811,7 @@
+@@ -35762,7 +38890,7 @@
{
gid_t gidset[NGID];
int i, n;
@@ -38398,7 +38947,7 @@
val.lval = -1;
for (i = 0; i < NGID; i++)
-@@ -35773,18 +38819,28 @@
+@@ -35770,18 +38898,28 @@
n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
gidset);
/* Exit non-zero if getgroups seems to require an array of ints. This
@@ -38433,7 +38982,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35797,8 +38853,10 @@
+@@ -35794,8 +38932,10 @@
( exit $ac_status )
ac_cv_type_getgroups=int
fi
@@ -38445,7 +38994,7 @@
if test $ac_cv_type_getgroups = cross; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -35819,8 +38877,8 @@
+@@ -35816,8 +38956,8 @@
fi
fi
@@ -38456,7 +39005,7 @@
cat >>confdefs.h <<_ACEOF
#define GETGROUPS_T $ac_cv_type_getgroups
-@@ -35828,8 +38886,8 @@
+@@ -35825,8 +38965,8 @@
@@ -38467,7 +39016,7 @@
if test "${ac_cv_type_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -35840,36 +38898,49 @@
+@@ -35837,36 +38977,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -38527,7 +39076,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35878,20 +38949,21 @@
+@@ -35875,23 +39028,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38545,22 +39094,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+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_char" = yes; then
+- if test "$ac_cv_type_char" = 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.
-@@ -35904,10 +38976,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
+@@ -35901,10 +39054,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char ac__type_sizeof_;
++ typedef char ac__type_sizeof_;
++
int
main ()
{
@@ -38569,7 +39125,7 @@
test_array [0] = 0
;
-@@ -35915,24 +38988,36 @@
+@@ -35912,24 +39067,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38614,11 +39170,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35945,10 +39030,11 @@
+@@ -35942,10 +39109,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char ac__type_sizeof_;
++ typedef char ac__type_sizeof_;
++
int
main ()
{
@@ -38627,7 +39184,7 @@
test_array [0] = 0
;
-@@ -35956,24 +39042,36 @@
+@@ -35953,24 +39122,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38672,7 +39229,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -35982,30 +39080,32 @@
+@@ -35979,30 +39160,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38705,7 +39262,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char ac__type_sizeof_;
++ typedef char ac__type_sizeof_;
++
int
main ()
{
@@ -38714,7 +39272,7 @@
test_array [0] = 0
;
-@@ -36013,24 +39113,36 @@
+@@ -36010,24 +39194,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38759,11 +39317,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36043,10 +39155,11 @@
+@@ -36040,10 +39236,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char ac__type_sizeof_;
++ typedef char ac__type_sizeof_;
++
int
main ()
{
@@ -38772,7 +39331,7 @@
test_array [0] = 0
;
-@@ -36054,24 +39167,36 @@
+@@ -36051,24 +39249,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38817,7 +39376,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36080,24 +39205,27 @@
+@@ -36077,24 +39287,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38855,11 +39414,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`
-@@ -36108,10 +39236,11 @@
+@@ -36105,10 +39318,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char ac__type_sizeof_;
++ typedef char ac__type_sizeof_;
++
int
main ()
{
@@ -38868,7 +39428,7 @@
test_array [0] = 0
;
-@@ -36119,24 +39248,36 @@
+@@ -36116,24 +39331,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -38913,7 +39473,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36145,26 +39286,20 @@
+@@ -36142,26 +39369,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38927,13 +39487,17 @@
case $ac_lo in
?*) ac_cv_sizeof_char=$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" = 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=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -38946,19 +39510,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36172,8 +39307,9 @@
+@@ -36169,8 +39394,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
-@@ -36182,35 +39318,44 @@
+@@ -36179,35 +39406,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -39016,12 +39581,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36221,29 +39366,28 @@
+@@ -36218,29 +39454,32 @@
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" = 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)
@@ -39030,18 +39596,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=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=0
+-else
+- ac_cv_sizeof_char=0
+-fi
fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_CHAR $ac_cv_sizeof_char
_ACEOF
@@ -39054,7 +39626,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36254,36 +39398,49 @@
+@@ -36251,36 +39490,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39114,7 +39686,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36292,20 +39449,21 @@
+@@ -36289,23 +39541,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39132,22 +39704,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.
-@@ -36318,10 +39476,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
+@@ -36315,10 +39567,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39156,7 +39735,7 @@
test_array [0] = 0
;
-@@ -36329,24 +39488,36 @@
+@@ -36326,24 +39580,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39201,11 +39780,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36359,10 +39530,11 @@
+@@ -36356,10 +39622,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39214,7 +39794,7 @@
test_array [0] = 0
;
-@@ -36370,24 +39542,36 @@
+@@ -36367,24 +39635,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39259,7 +39839,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36396,30 +39580,32 @@
+@@ -36393,30 +39673,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39292,7 +39872,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39301,7 +39882,7 @@
test_array [0] = 0
;
-@@ -36427,24 +39613,36 @@
+@@ -36424,24 +39707,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39346,11 +39927,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36457,10 +39655,11 @@
+@@ -36454,10 +39749,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39359,7 +39941,7 @@
test_array [0] = 0
;
-@@ -36468,24 +39667,36 @@
+@@ -36465,24 +39762,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39404,7 +39986,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36494,24 +39705,27 @@
+@@ -36491,24 +39800,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39442,11 +40024,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`
-@@ -36522,10 +39736,11 @@
+@@ -36519,10 +39831,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -39455,7 +40038,7 @@
test_array [0] = 0
;
-@@ -36533,24 +39748,36 @@
+@@ -36530,24 +39844,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39500,7 +40083,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36559,26 +39786,20 @@
+@@ -36556,26 +39882,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39514,13 +40097,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
@@ -39533,19 +40120,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36586,8 +39807,9 @@
+@@ -36583,8 +39907,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
-@@ -36596,35 +39818,44 @@
+@@ -36593,35 +39919,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -39603,12 +40191,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36635,29 +39866,28 @@
+@@ -36632,29 +39967,32 @@
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)
@@ -39617,18 +40206,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
@@ -39641,7 +40236,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -36668,36 +39898,49 @@
+@@ -36665,36 +40003,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -39701,7 +40296,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36706,20 +39949,21 @@
+@@ -36703,23 +40054,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39719,22 +40314,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.
-@@ -36732,10 +39976,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
+@@ -36729,10 +40080,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39743,7 +40345,7 @@
test_array [0] = 0
;
-@@ -36743,24 +39988,36 @@
+@@ -36740,24 +40093,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39788,11 +40390,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36773,10 +40030,11 @@
+@@ -36770,10 +40135,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39801,7 +40404,7 @@
test_array [0] = 0
;
-@@ -36784,24 +40042,36 @@
+@@ -36781,24 +40148,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39846,7 +40449,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36810,30 +40080,32 @@
+@@ -36807,30 +40186,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -39879,7 +40482,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39888,7 +40492,7 @@
test_array [0] = 0
;
-@@ -36841,24 +40113,36 @@
+@@ -36838,24 +40220,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39933,11 +40537,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36871,10 +40155,11 @@
+@@ -36868,10 +40262,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -39946,7 +40551,7 @@
test_array [0] = 0
;
-@@ -36882,24 +40167,36 @@
+@@ -36879,24 +40275,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -39991,7 +40596,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36908,24 +40205,27 @@
+@@ -36905,24 +40313,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40029,11 +40634,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`
-@@ -36936,10 +40236,11 @@
+@@ -36933,10 +40344,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -40042,7 +40648,7 @@
test_array [0] = 0
;
-@@ -36947,24 +40248,36 @@
+@@ -36944,24 +40357,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40087,7 +40693,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -36973,26 +40286,20 @@
+@@ -36970,26 +40395,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40101,13 +40707,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
@@ -40120,19 +40730,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37000,8 +40307,9 @@
+@@ -36997,8 +40420,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
-@@ -37010,35 +40318,44 @@
+@@ -37007,35 +40432,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -40190,12 +40801,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37049,29 +40366,28 @@
+@@ -37046,29 +40480,32 @@
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)
@@ -40204,18 +40816,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
@@ -40228,7 +40846,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37082,36 +40398,49 @@
+@@ -37079,36 +40516,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -40288,7 +40906,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37120,20 +40449,21 @@
+@@ -37117,23 +40567,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40306,22 +40924,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.
-@@ -37146,10 +40476,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
+@@ -37143,10 +40593,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 +40955,7 @@
test_array [0] = 0
;
-@@ -37157,24 +40488,36 @@
+@@ -37154,24 +40606,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40375,11 +41000,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37187,10 +40530,11 @@
+@@ -37184,10 +40648,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 +41014,7 @@
test_array [0] = 0
;
-@@ -37198,24 +40542,36 @@
+@@ -37195,24 +40661,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40433,7 +41059,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37224,30 +40580,32 @@
+@@ -37221,30 +40699,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40466,7 +41092,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 +41102,7 @@
test_array [0] = 0
;
-@@ -37255,24 +40613,36 @@
+@@ -37252,24 +40733,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40520,11 +41147,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37285,10 +40655,11 @@
+@@ -37282,10 +40775,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 +41161,7 @@
test_array [0] = 0
;
-@@ -37296,24 +40667,36 @@
+@@ -37293,24 +40788,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40578,7 +41206,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37322,24 +40705,27 @@
+@@ -37319,24 +40826,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40616,11 +41244,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`
-@@ -37350,10 +40736,11 @@
+@@ -37347,10 +40857,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 +41258,7 @@
test_array [0] = 0
;
-@@ -37361,24 +40748,36 @@
+@@ -37358,24 +40870,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40674,7 +41303,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37387,26 +40786,20 @@
+@@ -37384,26 +40908,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40688,13 +41317,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 +41340,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37414,8 +40807,9 @@
+@@ -37411,8 +40933,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
-@@ -37424,35 +40818,44 @@
+@@ -37421,35 +40945,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -40777,12 +41411,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37463,29 +40866,28 @@
+@@ -37460,29 +40993,32 @@
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 +41426,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
@@ -40815,7 +41456,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37511,24 +40913,36 @@
+@@ -37499,7 +41035,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
+
+@@ -37508,24 +41045,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40860,7 +41511,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37554,24 +40968,36 @@
+@@ -37551,24 +41100,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40905,7 +41556,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37580,14 +41006,15 @@
+@@ -37577,14 +41138,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40924,7 +41575,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -37597,11 +41024,11 @@
+@@ -37594,11 +41156,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -40940,7 +41591,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -37612,24 +41039,36 @@
+@@ -37609,24 +41171,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -40985,7 +41636,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37648,8 +41087,10 @@
+@@ -37645,8 +41219,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -40997,7 +41648,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -37657,27 +41098,41 @@
+@@ -37654,27 +41230,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -41046,7 +41697,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37690,13 +41145,16 @@
+@@ -37687,13 +41277,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -41067,7 +41718,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -37738,9 +41196,9 @@
+@@ -37735,9 +41328,9 @@
for ac_func in socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -41080,7 +41731,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37766,53 +41224,59 @@
+@@ -37763,53 +41356,59 @@
#undef $ac_func
@@ -41159,7 +41810,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37821,13 +41285,15 @@
+@@ -37818,13 +41417,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41168,7 +41819,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
@@ -41179,7 +41830,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37838,15 +41304,14 @@
+@@ -37835,15 +41436,14 @@
@@ -41198,7 +41849,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'
-@@ -37858,9 +41323,6 @@
+@@ -37855,9 +41455,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -41208,7 +41859,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37886,24 +41348,36 @@
+@@ -37883,24 +41480,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41253,7 +41904,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -37912,9 +41386,10 @@
+@@ -37909,9 +41518,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41266,7 +41917,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -37927,11 +41402,11 @@
+@@ -37924,11 +41534,11 @@
fi
@@ -41282,7 +41933,7 @@
if test "${kde_cv_proto_mkstemps+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -37952,8 +41427,7 @@
+@@ -37949,8 +41559,7 @@
if test "x$kde_cv_proto_mkstemps" = xunknown; then
@@ -41292,7 +41943,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'
-@@ -37991,24 +41465,36 @@
+@@ -37988,24 +41597,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41337,7 +41988,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38018,10 +41504,11 @@
+@@ -38015,10 +41636,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41347,11 +41998,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
-@@ -38034,8 +41521,8 @@
+@@ -38031,8 +41653,8 @@
fi
@@ -41362,7 +42013,7 @@
if test "x$kde_cv_func_mkstemps" = xyes; then
-@@ -38059,15 +41546,14 @@
+@@ -38056,15 +41678,14 @@
@@ -41381,7 +42032,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'
-@@ -38079,9 +41565,6 @@
+@@ -38076,9 +41697,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -41391,7 +42042,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38104,24 +41587,36 @@
+@@ -38101,24 +41719,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41436,7 +42087,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38130,9 +41625,10 @@
+@@ -38127,9 +41757,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41449,7 +42100,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38145,11 +41641,11 @@
+@@ -38142,11 +41773,11 @@
fi
@@ -41465,7 +42116,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38170,8 +41666,7 @@
+@@ -38167,8 +41798,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -41475,7 +42126,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'
-@@ -38206,24 +41701,36 @@
+@@ -38203,24 +41833,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41520,7 +42171,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38233,10 +41740,11 @@
+@@ -38230,10 +41872,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41530,11 +42181,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
-@@ -38249,8 +41757,8 @@
+@@ -38246,8 +41889,8 @@
fi
@@ -41545,7 +42196,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -38274,15 +41782,14 @@
+@@ -38271,15 +41914,14 @@
@@ -41564,7 +42215,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'
-@@ -38294,9 +41801,6 @@
+@@ -38291,9 +41933,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -41574,7 +42225,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38319,24 +41823,36 @@
+@@ -38316,24 +41955,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41619,7 +42270,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38345,9 +41861,10 @@
+@@ -38342,9 +41993,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41632,7 +42283,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38360,11 +41877,11 @@
+@@ -38357,11 +42009,11 @@
fi
@@ -41648,7 +42299,7 @@
if test "${kde_cv_proto_unsetenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38385,8 +41902,7 @@
+@@ -38382,8 +42034,7 @@
if test "x$kde_cv_proto_unsetenv" = xunknown; then
@@ -41658,7 +42309,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'
-@@ -38421,24 +41937,36 @@
+@@ -38418,24 +42069,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41703,7 +42354,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38448,10 +41976,11 @@
+@@ -38445,10 +42108,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41713,11 +42364,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
-@@ -38464,8 +41993,8 @@
+@@ -38461,8 +42125,8 @@
fi
@@ -41728,7 +42379,7 @@
if test "x$kde_cv_func_unsetenv" = xyes; then
-@@ -38489,15 +42018,14 @@
+@@ -38486,15 +42150,14 @@
@@ -41747,7 +42398,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'
-@@ -38509,9 +42037,6 @@
+@@ -38506,9 +42169,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -41757,7 +42408,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38539,24 +42064,36 @@
+@@ -38536,24 +42196,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41802,7 +42453,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38565,9 +42102,10 @@
+@@ -38562,9 +42234,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41815,7 +42466,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38580,11 +42118,11 @@
+@@ -38577,11 +42250,11 @@
fi
@@ -41831,7 +42482,7 @@
if test "${kde_cv_proto_getdomainname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38605,8 +42143,7 @@
+@@ -38602,8 +42275,7 @@
if test "x$kde_cv_proto_getdomainname" = xunknown; then
@@ -41841,7 +42492,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'
-@@ -38647,24 +42184,36 @@
+@@ -38644,24 +42316,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41886,7 +42537,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38674,10 +42223,11 @@
+@@ -38671,10 +42355,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41896,11 +42547,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
-@@ -38690,8 +42240,8 @@
+@@ -38687,8 +42372,8 @@
fi
@@ -41911,7 +42562,7 @@
if test "x$kde_cv_func_getdomainname" = xyes; then
-@@ -38715,15 +42265,14 @@
+@@ -38712,15 +42397,14 @@
@@ -41930,7 +42581,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'
-@@ -38735,9 +42284,6 @@
+@@ -38732,9 +42416,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -41940,7 +42591,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38764,24 +42310,36 @@
+@@ -38761,24 +42442,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -41985,7 +42636,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38790,9 +42348,10 @@
+@@ -38787,9 +42480,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -41998,7 +42649,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -38805,11 +42364,11 @@
+@@ -38802,11 +42496,11 @@
fi
@@ -42014,7 +42665,7 @@
if test "${kde_cv_proto_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -38830,8 +42389,7 @@
+@@ -38827,8 +42521,7 @@
if test "x$kde_cv_proto_gethostname" = xunknown; then
@@ -42024,7 +42675,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'
-@@ -38870,24 +42428,36 @@
+@@ -38867,24 +42560,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42069,7 +42720,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -38897,10 +42467,11 @@
+@@ -38894,10 +42599,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42079,11 +42730,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
-@@ -38913,8 +42484,8 @@
+@@ -38910,8 +42616,8 @@
fi
@@ -42094,7 +42745,7 @@
if test "x$kde_cv_func_gethostname" = xyes; then
-@@ -38938,15 +42509,14 @@
+@@ -38935,15 +42641,14 @@
@@ -42113,7 +42764,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'
-@@ -38958,9 +42528,6 @@
+@@ -38955,9 +42660,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42123,7 +42774,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38985,24 +42552,36 @@
+@@ -38982,24 +42684,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42168,7 +42819,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39011,9 +42590,10 @@
+@@ -39008,9 +42722,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42181,7 +42832,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -39026,11 +42606,11 @@
+@@ -39023,11 +42738,11 @@
fi
@@ -42197,7 +42848,7 @@
if test "${kde_cv_proto_usleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39051,8 +42631,7 @@
+@@ -39048,8 +42763,7 @@
if test "x$kde_cv_proto_usleep" = xunknown; then
@@ -42207,7 +42858,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'
-@@ -39089,24 +42668,36 @@
+@@ -39086,24 +42800,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42252,7 +42903,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39116,10 +42707,11 @@
+@@ -39113,10 +42839,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42262,11 +42913,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
-@@ -39132,8 +42724,8 @@
+@@ -39129,8 +42856,8 @@
fi
@@ -42277,7 +42928,7 @@
if test "x$kde_cv_func_usleep" = xyes; then
-@@ -39157,15 +42749,14 @@
+@@ -39154,15 +42881,14 @@
@@ -42296,7 +42947,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'
-@@ -39177,9 +42768,6 @@
+@@ -39174,9 +42900,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42306,7 +42957,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39204,24 +42792,36 @@
+@@ -39201,24 +42924,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42351,7 +43002,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39230,9 +42830,10 @@
+@@ -39227,9 +42962,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42364,7 +43015,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -39245,11 +42846,11 @@
+@@ -39242,11 +42978,11 @@
fi
@@ -42380,7 +43031,7 @@
if test "${kde_cv_proto_random+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39270,8 +42871,7 @@
+@@ -39267,8 +43003,7 @@
if test "x$kde_cv_proto_random" = xunknown; then
@@ -42390,7 +43041,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'
-@@ -39308,24 +42908,36 @@
+@@ -39305,24 +43040,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42435,7 +43086,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39335,10 +42947,11 @@
+@@ -39332,10 +43079,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42445,11 +43096,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
-@@ -39351,8 +42964,8 @@
+@@ -39348,8 +43096,8 @@
fi
@@ -42460,7 +43111,7 @@
if test "x$kde_cv_func_random" = xyes; then
-@@ -39375,15 +42988,14 @@
+@@ -39372,15 +43120,14 @@
@@ -42479,7 +43130,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'
-@@ -39395,9 +43007,6 @@
+@@ -39392,9 +43139,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -42489,7 +43140,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39422,24 +43031,36 @@
+@@ -39419,24 +43163,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -42534,7 +43185,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39448,9 +43069,10 @@
+@@ -39445,9 +43201,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42547,7 +43198,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -39463,11 +43085,11 @@
+@@ -39460,11 +43217,11 @@
fi
@@ -42563,7 +43214,7 @@
if test "${kde_cv_proto_srandom+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39488,8 +43110,7 @@
+@@ -39485,8 +43242,7 @@
if test "x$kde_cv_proto_srandom" = xunknown; then
@@ -42573,7 +43224,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'
-@@ -39526,24 +43147,36 @@
+@@ -39523,24 +43279,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42618,7 +43269,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39553,10 +43186,11 @@
+@@ -39550,10 +43318,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42628,11 +43279,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
-@@ -39569,8 +43203,8 @@
+@@ -39566,8 +43335,8 @@
fi
@@ -42643,7 +43294,7 @@
if test "x$kde_cv_func_srandom" = xyes; then
-@@ -39594,8 +43228,8 @@
+@@ -39591,8 +43360,8 @@
@@ -42654,7 +43305,7 @@
if test "${ac_cv_have_s_issock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39621,24 +43255,36 @@
+@@ -39618,24 +43387,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42699,7 +43350,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39647,15 +43293,16 @@
+@@ -39644,15 +43425,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42708,7 +43359,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
@@ -42720,7 +43371,7 @@
if test "$ac_cv_have_s_issock" = "yes"; then
cat >>confdefs.h <<_ACEOF
-@@ -39669,8 +43316,8 @@
+@@ -39666,8 +43448,8 @@
@@ -42731,7 +43382,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39706,16 +43353,16 @@
+@@ -39703,16 +43485,16 @@
fi
@@ -42752,7 +43403,7 @@
case "$host_os" in
linux*) utmp_support=yes;
-@@ -39727,8 +43374,8 @@
+@@ -39724,8 +43506,8 @@
*) utmp_support=no;
esac
@@ -42763,7 +43414,7 @@
if test "$utmp_support" = yes; then
-@@ -39739,8 +43386,8 @@
+@@ -39736,8 +43518,8 @@
fi
@@ -42774,7 +43425,7 @@
if test "${kde_cv_utmp_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -39771,18 +43418,18 @@
+@@ -39768,18 +43550,18 @@
_ACEOF
@@ -42799,7 +43450,7 @@
if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -39795,40 +43442,52 @@
+@@ -39792,40 +43574,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42864,7 +43515,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39837,14 +43496,15 @@
+@@ -39834,14 +43628,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42873,7 +43524,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
@@ -42884,7 +43535,7 @@
if test $ac_cv_lib_kstat_kstat_open = yes; then
LIBKSTAT=-lkstat
else
-@@ -39861,17 +43521,17 @@
+@@ -39858,17 +43653,17 @@
fi
if test "${ac_cv_header_libdevinfo_h+set}" = set; then
@@ -42908,7 +43559,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39882,24 +43542,36 @@
+@@ -39879,24 +43674,36 @@
#include <libdevinfo.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -42953,7 +43604,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -39908,15 +43580,16 @@
+@@ -39905,15 +43712,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -42976,7 +43627,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39925,8 +43598,13 @@
+@@ -39922,8 +43730,13 @@
/* end confdefs.h. */
#include <libdevinfo.h>
_ACEOF
@@ -42992,7 +43643,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -39950,9 +43628,10 @@
+@@ -39947,9 +43760,10 @@
ac_header_preproc=no
fi
@@ -43005,7 +43656,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -39976,25 +43655,18 @@
+@@ -39973,25 +43787,18 @@
echo "$as_me: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&2;}
@@ -43036,7 +43687,7 @@
fi
if test $ac_cv_header_libdevinfo_h = yes; then
-@@ -40006,8 +43678,8 @@
+@@ -40003,8 +43810,8 @@
if test "$kde_have_libdevinfo_h" = "yes"; then
kde_have_libdevinfo_lib=yes
@@ -43047,7 +43698,7 @@
if test "${ac_cv_lib_devinfo_di_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40020,40 +43692,52 @@
+@@ -40017,40 +43824,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43112,7 +43763,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40062,14 +43746,15 @@
+@@ -40059,14 +43878,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43121,7 +43772,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
@@ -43132,7 +43783,7 @@
if test $ac_cv_lib_devinfo_di_init = yes; then
LIBDEVINFO=-ldevinfo
else
-@@ -40089,18 +43774,18 @@
+@@ -40086,18 +43906,18 @@
@@ -43157,7 +43808,7 @@
if test "x$ac_java_dir" = "xno"; then
kde_java_bindir=no
-@@ -40536,8 +44221,7 @@
+@@ -40533,8 +44353,7 @@
if test -n "$jni_includes"; then
@@ -43167,7 +43818,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'
-@@ -40571,24 +44255,36 @@
+@@ -40568,24 +44387,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -43212,7 +43863,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40597,9 +44293,10 @@
+@@ -40594,9 +44425,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43225,7 +43876,7 @@
if test $kde_jni_works = no; then
{ { echo "$as_me:$LINENO: error: Incorrect version of $kde_java_includedir/jni.h.
-@@ -40641,8 +44338,8 @@
+@@ -40638,8 +44470,8 @@
else
JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi
@@ -43236,7 +43887,7 @@
else
-@@ -40650,8 +44347,8 @@
+@@ -40647,8 +44479,8 @@
#define PATH_JAVA "$kde_java_bindir/java"
_ACEOF
@@ -43247,7 +43898,7 @@
fi
elif test -d "/Library/Java/Home"; then
kde_java_bindir="/Library/Java/Home/bin"
-@@ -40667,11 +44364,11 @@
+@@ -40664,11 +44496,11 @@
#define PATH_JAVA "$kde_java_bindir/java"
_ACEOF
@@ -43263,7 +43914,7 @@
fi
-@@ -40690,8 +44387,8 @@
+@@ -40687,8 +44519,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
@@ -43274,7 +43925,7 @@
if test "${ac_cv_path_MD5SUM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40706,35 +44403,36 @@
+@@ -40703,35 +44535,36 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -43319,7 +43970,7 @@
if test "${ac_cv_path_MD5SUM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40749,32 +44447,33 @@
+@@ -40746,32 +44579,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -43361,7 +44012,7 @@
if test "${ac_cv_path_MD5SUM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40789,27 +44488,28 @@
+@@ -40786,27 +44620,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -43396,7 +44047,7 @@
fi
if test -z "$MD5SUM" ; then
{ echo "$as_me:$LINENO: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&5
-@@ -40831,8 +44531,7 @@
+@@ -40828,8 +44663,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -43406,7 +44057,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'
-@@ -40842,17 +44541,17 @@
+@@ -40839,17 +44673,17 @@
if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
@@ -43430,7 +44081,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40863,24 +44562,36 @@
+@@ -40860,24 +44694,36 @@
#include <X11/extensions/XTest.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43475,7 +44126,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -40889,15 +44600,16 @@
+@@ -40886,15 +44732,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43498,7 +44149,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40906,8 +44618,13 @@
+@@ -40903,8 +44750,13 @@
/* end confdefs.h. */
#include <X11/extensions/XTest.h>
_ACEOF
@@ -43514,7 +44165,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -40931,9 +44648,10 @@
+@@ -40928,9 +44780,10 @@
ac_header_preproc=no
fi
@@ -43527,7 +44178,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -40957,30 +44675,23 @@
+@@ -40954,30 +44807,23 @@
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;}
@@ -43565,7 +44216,7 @@
if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -40993,40 +44704,52 @@
+@@ -40990,40 +44836,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43630,7 +44281,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41035,14 +44758,15 @@
+@@ -41032,14 +44890,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43639,7 +44290,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
@@ -43650,7 +44301,7 @@
if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41070,8 +44794,7 @@
+@@ -41067,8 +44926,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -43660,7 +44311,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'
-@@ -41080,8 +44803,8 @@
+@@ -41077,8 +44935,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -43671,7 +44322,7 @@
if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41096,24 +44819,36 @@
+@@ -41093,24 +44951,36 @@
#include <X11/XKBlib.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -43716,7 +44367,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41122,15 +44857,16 @@
+@@ -41119,15 +44989,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43739,7 +44390,7 @@
if test "${ac_cv_lib_X11_XkbLockModifiers+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41143,40 +44879,52 @@
+@@ -41140,40 +45011,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43804,7 +44455,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41185,14 +44933,15 @@
+@@ -41182,14 +45065,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43813,7 +44464,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
@@ -43824,7 +44475,7 @@
if test $ac_cv_lib_X11_XkbLockModifiers = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41201,8 +44950,8 @@
+@@ -41198,8 +45082,8 @@
fi
@@ -43835,7 +44486,7 @@
if test "${ac_cv_lib_X11_XkbSetPerClientControls+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41215,40 +44964,52 @@
+@@ -41212,40 +45096,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43900,7 +44551,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41257,14 +45018,15 @@
+@@ -41254,14 +45150,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -43909,7 +44560,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
@@ -43920,7 +44571,7 @@
if test $ac_cv_lib_X11_XkbSetPerClientControls = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -41290,10 +45052,9 @@
+@@ -41287,10 +45184,9 @@
@@ -43932,7 +44583,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'
-@@ -41306,9 +45067,9 @@
+@@ -41303,9 +45199,9 @@
for ac_header in X11/Xcursor/Xcursor.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -43945,7 +44596,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -41322,24 +45083,36 @@
+@@ -41319,24 +45215,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -43990,7 +44641,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41348,12 +45121,14 @@
+@@ -41345,12 +45253,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44009,7 +44660,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -41367,8 +45142,8 @@
+@@ -41364,8 +45274,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -44020,7 +44671,7 @@
if test "${ac_cv_lib_Xcursor_XcursorSupportsARGB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41381,40 +45156,52 @@
+@@ -41378,40 +45288,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44085,7 +44736,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41423,14 +45210,15 @@
+@@ -41420,14 +45342,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44094,7 +44745,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
@@ -44105,7 +44756,7 @@
if test $ac_cv_lib_Xcursor_XcursorSupportsARGB = yes; then
LIB_XCURSOR=-lXcursor
-@@ -41476,8 +45264,7 @@
+@@ -41473,8 +45396,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -44115,7 +44766,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'
-@@ -41487,17 +45274,17 @@
+@@ -41484,17 +45406,17 @@
if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
@@ -44139,7 +44790,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41508,24 +45295,36 @@
+@@ -41505,24 +45427,36 @@
#include <X11/extensions/Xrender.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44184,7 +44835,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41534,15 +45333,16 @@
+@@ -41531,15 +45465,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44207,7 +44858,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41551,8 +45351,13 @@
+@@ -41548,8 +45483,13 @@
/* end confdefs.h. */
#include <X11/extensions/Xrender.h>
_ACEOF
@@ -44223,7 +44874,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -41576,9 +45381,10 @@
+@@ -41573,9 +45513,10 @@
ac_header_preproc=no
fi
@@ -44236,7 +44887,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -41602,25 +45408,18 @@
+@@ -41599,25 +45540,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;}
@@ -44267,7 +44918,7 @@
fi
if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-@@ -41648,8 +45447,8 @@
+@@ -41645,8 +45579,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -44278,7 +44929,7 @@
if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41662,40 +45461,52 @@
+@@ -41659,40 +45593,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44343,7 +44994,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -41704,14 +45515,15 @@
+@@ -41701,14 +45647,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44352,7 +45003,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
@@ -44363,7 +45014,7 @@
if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
LIB_XRENDER=-lXrender
-@@ -41736,8 +45548,8 @@
+@@ -41733,8 +45680,8 @@
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
@@ -44374,16 +45025,16 @@
kde_qtdir=
if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
-@@ -41749,7 +45561,7 @@
+@@ -41746,7 +45693,7 @@
do
for j in qsql.html;
do
-- echo "configure: 41752: $i/$j" >&5
-+ echo "configure: 45564: $i/$j" >&5
+- echo "configure: 41749: $i/$j" >&5
++ echo "configure: 45696: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41758,20 +45570,20 @@
+@@ -41755,20 +45702,20 @@
done
done
@@ -44409,7 +45060,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41814,12 +45626,12 @@
+@@ -41811,12 +45758,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -44426,7 +45077,7 @@
DOT=$kde_cv_path
fi
-@@ -41831,14 +45643,14 @@
+@@ -41828,14 +45775,14 @@
fi
@@ -44444,7 +45095,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -41881,12 +45693,12 @@
+@@ -41878,12 +45825,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -44461,7 +45112,7 @@
DOXYGEN=$kde_cv_path
fi
-@@ -41952,14 +45764,14 @@
+@@ -41949,14 +45896,14 @@
@@ -44479,7 +45130,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42002,15 +45814,15 @@
+@@ -41999,15 +45946,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -44499,7 +45150,7 @@
LIBART_CONFIG=$kde_cv_path
fi
-@@ -42049,11 +45861,11 @@
+@@ -42046,11 +45993,11 @@
@@ -44514,7 +45165,7 @@
if test -z "$RUN_KAPPFINDER"; then
-@@ -42066,8 +45878,7 @@
+@@ -42063,8 +46010,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -44524,7 +45175,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'
-@@ -42076,8 +45887,8 @@
+@@ -42073,8 +46019,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -44535,7 +45186,7 @@
if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42094,24 +45905,36 @@
+@@ -42091,24 +46037,36 @@
#include <X11/extensions/XKBstr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44580,7 +45231,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42120,12 +45943,13 @@
+@@ -42117,12 +46075,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44598,7 +45249,7 @@
if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
ACCESS_SUBDIR=access
fi
-@@ -42156,8 +45980,7 @@
+@@ -42153,8 +46112,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -44608,7 +45259,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'
-@@ -42167,17 +45990,17 @@
+@@ -42164,17 +46122,17 @@
if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
@@ -44632,7 +45283,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42188,24 +46011,36 @@
+@@ -42185,24 +46143,36 @@
#include <X11/extensions/XKBstr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -44677,7 +45328,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42214,15 +46049,16 @@
+@@ -42211,15 +46181,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44700,7 +45351,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -42231,8 +46067,13 @@
+@@ -42228,8 +46199,13 @@
/* end confdefs.h. */
#include <X11/extensions/XKBstr.h>
_ACEOF
@@ -44716,7 +45367,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -42256,9 +46097,10 @@
+@@ -42253,9 +46229,10 @@
ac_header_preproc=no
fi
@@ -44729,7 +45380,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -42282,25 +46124,18 @@
+@@ -42279,25 +46256,18 @@
echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&2;}
@@ -44760,7 +45411,7 @@
fi
if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
-@@ -42335,26 +46170,26 @@
+@@ -42332,26 +46302,26 @@
ssl_libraries=""
ssl_includes=""
@@ -44797,16 +45448,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -42369,7 +46204,7 @@
+@@ -42366,7 +46336,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 42372: $i/$j" >&5
-+ echo "configure: 46207: $i/$j" >&5
+- echo "configure: 42369: $i/$j" >&5
++ echo "configure: 46339: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42416,24 +46251,36 @@
+@@ -42413,24 +46383,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44851,7 +45502,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42443,10 +46290,11 @@
+@@ -42440,10 +46422,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -44861,11 +45512,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"
-@@ -42464,26 +46312,26 @@
+@@ -42461,26 +46444,26 @@
eval "$ac_cv_have_ssl"
@@ -44905,7 +45556,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42556,8 +46404,8 @@
+@@ -42553,8 +46536,8 @@
eval "$ac_cv_ssl_version"
@@ -44916,7 +45567,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -42616,25 +46464,25 @@
+@@ -42613,25 +46596,25 @@
DPMS_LIB=
@@ -44950,7 +45601,7 @@
ac_cv_have_dpms="no"
else
ac_save_ldflags="$LDFLAGS"
-@@ -42666,24 +46514,36 @@
+@@ -42663,24 +46646,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44995,7 +45646,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42716,24 +46576,36 @@
+@@ -42713,24 +46708,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45040,7 +45691,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42744,13 +46616,15 @@
+@@ -42741,13 +46748,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45049,17 +45700,17 @@
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
-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_save_ldflags"
CFLAGS="$ac_save_cflags"
-@@ -42760,8 +46634,8 @@
+@@ -42757,8 +46766,8 @@
fi
if test "$ac_cv_have_dpms" = no; then
@@ -45070,7 +45721,7 @@
DPMS_LDFLAGS=""
DPMSINC=""
-@@ -42784,8 +46658,8 @@
+@@ -42781,8 +46790,8 @@
else
DPMSINC="-I$DPMS_INCLUDE"
fi
@@ -45081,7 +45732,7 @@
fi
fi
-@@ -42794,8 +46668,8 @@
+@@ -42791,8 +46800,8 @@
test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
@@ -45092,7 +45743,7 @@
if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42813,6 +46687,7 @@
+@@ -42810,6 +46819,7 @@
{
#ifndef DPMSCapable
char *p = (char *) DPMSCapable;
@@ -45100,7 +45751,7 @@
#endif
;
-@@ -42820,24 +46695,36 @@
+@@ -42817,24 +46827,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45145,7 +45796,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42846,12 +46733,13 @@
+@@ -42843,12 +46865,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45163,7 +45814,7 @@
if test $ac_cv_have_decl_DPMSCapable = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DPMSCAPABLE_PROTO 1
-@@ -42861,8 +46749,8 @@
+@@ -42858,8 +46881,8 @@
@@ -45174,7 +45825,7 @@
if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42880,6 +46768,7 @@
+@@ -42877,6 +46900,7 @@
{
#ifndef DPMSInfo
char *p = (char *) DPMSInfo;
@@ -45182,7 +45833,7 @@
#endif
;
-@@ -42887,24 +46776,36 @@
+@@ -42884,24 +46908,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -45227,7 +45878,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -42913,12 +46814,13 @@
+@@ -42910,12 +46946,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45245,7 +45896,7 @@
if test $ac_cv_have_decl_DPMSInfo = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DPMSINFO_PROTO 1
-@@ -42932,14 +46834,14 @@
+@@ -42929,14 +46966,14 @@
@@ -45263,7 +45914,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -42982,18 +46884,18 @@
+@@ -42979,18 +47016,18 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -45287,7 +45938,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43036,23 +46938,23 @@
+@@ -43033,23 +47070,23 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -45317,7 +45968,7 @@
FONTCONFIG_CONFIG=$kde_cv_path
fi
-@@ -43116,8 +47018,8 @@
+@@ -43113,8 +47150,8 @@
case "$host" in
*-*-osf*)
@@ -45328,7 +45979,7 @@
if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43130,40 +47032,52 @@
+@@ -43127,40 +47164,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45393,7 +46044,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43172,14 +47086,15 @@
+@@ -43169,14 +47218,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45402,7 +46053,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
@@ -45413,7 +46064,7 @@
if test $ac_cv_lib_mach_vm_statistics = yes; then
LIB_TRU64_MACH="-lmach"
fi
-@@ -43190,18 +47105,19 @@
+@@ -43187,18 +47237,19 @@
for ac_header in linux/raw.h sys/raw.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -45441,7 +46092,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43212,24 +47128,36 @@
+@@ -43209,24 +47260,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -45486,7 +46137,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43238,15 +47166,16 @@
+@@ -43235,15 +47298,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45509,7 +46160,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43255,8 +47184,13 @@
+@@ -43252,8 +47316,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -45525,7 +46176,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -43280,9 +47214,10 @@
+@@ -43277,9 +47346,10 @@
ac_header_preproc=no
fi
@@ -45538,7 +46189,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43306,25 +47241,19 @@
+@@ -43303,25 +47373,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;}
@@ -45571,7 +46222,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43341,18 +47270,19 @@
+@@ -43338,18 +47402,19 @@
for ac_header in devinfo.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -45599,7 +46250,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43363,24 +47293,36 @@
+@@ -43360,24 +47425,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -45644,7 +46295,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43389,15 +47331,16 @@
+@@ -43386,15 +47463,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45667,7 +46318,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -43406,8 +47349,13 @@
+@@ -43403,8 +47481,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -45683,7 +46334,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -43431,9 +47379,10 @@
+@@ -43428,9 +47511,10 @@
ac_header_preproc=no
fi
@@ -45696,7 +46347,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43457,25 +47406,19 @@
+@@ -43454,25 +47538,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;}
@@ -45729,7 +46380,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43487,8 +47430,8 @@
+@@ -43484,8 +47562,8 @@
done
@@ -45740,7 +46391,7 @@
if test "${ac_cv_lib_devinfo_devinfo_foreach_rman+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43501,40 +47444,52 @@
+@@ -43498,40 +47576,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45805,7 +46456,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43543,14 +47498,15 @@
+@@ -43540,14 +47630,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45814,7 +46465,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
@@ -45825,7 +46476,7 @@
if test $ac_cv_lib_devinfo_devinfo_foreach_rman = yes; then
LIBDEVINFO="-ldevinfo"
fi
-@@ -43565,28 +47521,27 @@
+@@ -43562,28 +47653,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -45861,7 +46512,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'
-@@ -43622,24 +47577,36 @@
+@@ -43619,24 +47709,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45906,7 +46557,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43648,9 +47615,10 @@
+@@ -43645,9 +47747,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -45915,11 +46566,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'
-@@ -43665,8 +47633,8 @@
+@@ -43662,8 +47765,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -45930,7 +46581,7 @@
GL_LDFLAGS=""
GLINC=""
have_gl=no
-@@ -43686,8 +47654,8 @@
+@@ -43683,8 +47786,8 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -45941,7 +46592,7 @@
have_gl=yes
fi
fi
-@@ -43706,15 +47674,14 @@
+@@ -43703,15 +47806,14 @@
@@ -45960,7 +46611,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'
-@@ -43742,24 +47709,36 @@
+@@ -43739,24 +47841,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46005,7 +46656,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43768,9 +47747,10 @@
+@@ -43765,9 +47879,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46014,11 +46665,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'
-@@ -43781,8 +47761,8 @@
+@@ -43778,8 +47893,8 @@
fi
@@ -46029,7 +46680,7 @@
if test "$kde_cv_c_long_long" = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -43793,13 +47773,13 @@
+@@ -43790,13 +47905,13 @@
@@ -46047,7 +46698,7 @@
USB_LIBS=
USB_CFLAGS=
-@@ -43807,8 +47787,8 @@
+@@ -43804,8 +47919,8 @@
if test "x$with_libusb" != xno; then
# Extract the first word of "libusb-config", so it can be a program name with args.
set dummy libusb-config; ac_word=$2
@@ -46058,7 +46709,7 @@
if test "${ac_cv_path_LIBUSBCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43823,34 +47803,35 @@
+@@ -43820,34 +47935,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -46102,7 +46753,7 @@
if test "${ac_cv_lib_usb_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -43868,30 +47849,42 @@
+@@ -43865,30 +47981,42 @@
int
main ()
{
@@ -46154,7 +46805,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -43900,14 +47893,15 @@
+@@ -43897,14 +48025,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46163,7 +46814,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
@@ -46174,7 +46825,7 @@
if test $ac_cv_lib_usb_main = yes; then
have_libusb=yes
-@@ -43951,14 +47945,14 @@
+@@ -43948,14 +48077,14 @@
KFI_FOUND_FREETYPE=0
@@ -46192,7 +46843,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44001,15 +47995,15 @@
+@@ -43998,15 +48127,15 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46212,7 +46863,7 @@
FREETYPE_CONFIG=$kde_cv_path
fi
-@@ -44045,14 +48039,14 @@
+@@ -44042,14 +48171,14 @@
KFI_FOUND_FONTCONFIG=0
# check for fontconfig...
@@ -46230,7 +46881,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44095,18 +48089,18 @@
+@@ -44092,18 +48221,18 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46254,7 +46905,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44149,23 +48143,23 @@
+@@ -44146,23 +48275,23 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -46284,7 +46935,7 @@
FONTCONFIG_CONFIG=$kde_cv_path
fi
-@@ -44213,8 +48207,8 @@
+@@ -44210,8 +48339,8 @@
# Check OS...
@@ -46295,7 +46946,7 @@
case "$host" in
*-*-linux*) UNAME='Linux' ;;
*-*-freebsd*) UNAME='FreeBSD' ;;
-@@ -44227,8 +48221,8 @@
+@@ -44224,8 +48353,8 @@
*-*-darwin*) UNAME='Darwin' ;;
*) UNAME='Unknown' ;;
esac
@@ -46306,7 +46957,7 @@
# Check for fontenc...
-@@ -44237,8 +48231,7 @@
+@@ -44234,8 +48363,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -46316,7 +46967,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'
-@@ -44248,17 +48241,17 @@
+@@ -44245,17 +48373,17 @@
if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
@@ -46340,7 +46991,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44269,24 +48262,36 @@
+@@ -44266,24 +48394,36 @@
#include <X11/fonts/fontenc.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -46385,7 +47036,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44295,15 +48300,16 @@
+@@ -44292,15 +48432,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46408,7 +47059,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44312,8 +48318,13 @@
+@@ -44309,8 +48450,13 @@
/* end confdefs.h. */
#include <X11/fonts/fontenc.h>
_ACEOF
@@ -46424,7 +47075,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -44337,9 +48348,10 @@
+@@ -44334,9 +48480,10 @@
ac_header_preproc=no
fi
@@ -46437,7 +47088,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -44363,25 +48375,18 @@
+@@ -44360,25 +48507,18 @@
echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&2;}
@@ -46468,7 +47119,7 @@
fi
if test $ac_cv_header_X11_fonts_fontenc_h = yes; then
-@@ -44404,16 +48409,15 @@
+@@ -44401,16 +48541,15 @@
ac_LDFLAGS_save="$LDFLAGS"
ld_shared_flag=
@@ -46489,7 +47140,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'
-@@ -44440,24 +48444,36 @@
+@@ -44437,24 +48576,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46534,7 +47185,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44466,8 +48482,10 @@
+@@ -44463,8 +48614,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46542,11 +47193,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
-@@ -44480,13 +48498,13 @@
+@@ -44477,13 +48630,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -46564,7 +47215,7 @@
:
fi
-@@ -44501,8 +48519,8 @@
+@@ -44498,8 +48651,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -46575,7 +47226,7 @@
if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44515,40 +48533,52 @@
+@@ -44512,40 +48665,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -46640,7 +47291,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44557,14 +48587,15 @@
+@@ -44554,14 +48719,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46649,7 +47300,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
@@ -46660,7 +47311,7 @@
if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
ac_font_enc_lib=1
else
-@@ -44597,17 +48628,17 @@
+@@ -44594,17 +48760,17 @@
CPPFLAGS="$CXXFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
@@ -46684,7 +47335,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44618,24 +48649,36 @@
+@@ -44615,24 +48781,36 @@
#include <X11/Xft/Xft.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -46729,7 +47380,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44644,15 +48687,16 @@
+@@ -44641,15 +48819,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46752,7 +47403,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44661,8 +48705,13 @@
+@@ -44658,8 +48837,13 @@
/* end confdefs.h. */
#include <X11/Xft/Xft.h>
_ACEOF
@@ -46768,7 +47419,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -44686,9 +48735,10 @@
+@@ -44683,9 +48867,10 @@
ac_header_preproc=no
fi
@@ -46781,7 +47432,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -44712,25 +48762,18 @@
+@@ -44709,25 +48894,18 @@
echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
@@ -46812,7 +47463,7 @@
fi
if test $ac_cv_header_X11_Xft_Xft_h = yes; then
-@@ -44792,9 +48835,9 @@
+@@ -44789,9 +48967,9 @@
for ac_func in getifaddrs getnameinfo
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -46825,7 +47476,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -44820,53 +48863,59 @@
+@@ -44817,53 +48995,59 @@
#undef $ac_func
@@ -46904,7 +47555,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44875,13 +48924,15 @@
+@@ -44872,13 +49056,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46913,7 +47564,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
@@ -46924,7 +47575,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -44890,8 +48941,8 @@
+@@ -44887,8 +49073,8 @@
fi
done
@@ -46935,7 +47586,7 @@
if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -44916,24 +48967,36 @@
+@@ -44913,24 +49099,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -46980,7 +47631,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44942,7 +49005,7 @@
+@@ -44939,7 +49137,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -46989,7 +47640,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -44963,24 +49026,36 @@
+@@ -44960,24 +49158,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -47034,7 +47685,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -44989,14 +49064,16 @@
+@@ -44986,14 +49196,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47056,7 +47707,7 @@
if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -45012,10 +49089,9 @@
+@@ -45009,10 +49221,9 @@
@@ -47068,7 +47719,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'
-@@ -45028,9 +49104,9 @@
+@@ -45025,9 +49236,9 @@
for ac_header in X11/extensions/Xrandr.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -47081,7 +47732,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -45044,24 +49120,36 @@
+@@ -45041,24 +49252,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -47126,7 +47777,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45070,12 +49158,14 @@
+@@ -45067,12 +49290,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47145,7 +47796,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -45105,8 +49195,8 @@
+@@ -45102,8 +49327,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -47156,7 +47807,7 @@
if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45119,40 +49209,52 @@
+@@ -45116,40 +49341,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -47221,7 +47872,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45161,14 +49263,15 @@
+@@ -45158,14 +49395,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47230,7 +47881,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
@@ -47241,7 +47892,7 @@
if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then
LIB_XRANDR=-lXrandr
-@@ -45207,28 +49310,27 @@
+@@ -45204,28 +49442,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -47277,7 +47928,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'
-@@ -45264,24 +49366,36 @@
+@@ -45261,24 +49498,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47322,7 +47973,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45290,9 +49404,10 @@
+@@ -45287,9 +49536,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47331,11 +47982,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'
-@@ -45307,8 +49422,8 @@
+@@ -45304,8 +49554,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -47346,7 +47997,7 @@
GL_LDFLAGS=""
GLINC=""
-@@ -45329,11 +49444,11 @@
+@@ -45326,11 +49576,11 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -47362,7 +48013,7 @@
if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45346,40 +49461,52 @@
+@@ -45343,40 +49593,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -47427,7 +48078,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45388,14 +49515,15 @@
+@@ -45385,14 +49647,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47436,7 +48087,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
@@ -47447,7 +48098,7 @@
if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-@@ -45418,8 +49546,7 @@
+@@ -45415,8 +49678,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -47457,7 +48108,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'
-@@ -45429,17 +49556,17 @@
+@@ -45426,17 +49688,17 @@
if test "${ac_cv_header_kcarddb_h+set}" = set; then
@@ -47481,7 +48132,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45450,24 +49577,36 @@
+@@ -45447,24 +49709,36 @@
#include <kcarddb.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -47526,7 +48177,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45476,15 +49615,16 @@
+@@ -45473,15 +49747,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47549,7 +48200,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45493,8 +49633,13 @@
+@@ -45490,8 +49765,13 @@
/* end confdefs.h. */
#include <kcarddb.h>
_ACEOF
@@ -47565,7 +48216,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -45518,9 +49663,10 @@
+@@ -45515,9 +49795,10 @@
ac_header_preproc=no
fi
@@ -47578,7 +48229,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -45544,25 +49690,18 @@
+@@ -45541,25 +49822,18 @@
echo "$as_me: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&2;}
@@ -47609,7 +48260,7 @@
fi
if test $ac_cv_header_kcarddb_h = yes; then
-@@ -45609,11 +49748,11 @@
+@@ -45606,11 +49880,11 @@
@@ -47624,7 +48275,7 @@
if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
-@@ -45636,13 +49775,13 @@
+@@ -45633,13 +49907,13 @@
@@ -47642,7 +48293,7 @@
VIEW1394_SUBDIR=
if test "x$with_libraw1394" != xno; then
-@@ -45650,8 +49789,7 @@
+@@ -45647,8 +49921,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -47652,7 +48303,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'
-@@ -45661,17 +49799,17 @@
+@@ -45658,17 +49931,17 @@
if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
@@ -47676,7 +48327,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45682,24 +49820,36 @@
+@@ -45679,24 +49952,36 @@
#include <libraw1394/raw1394.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -47721,7 +48372,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45708,15 +49858,16 @@
+@@ -45705,15 +49990,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47744,7 +48395,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45725,8 +49876,13 @@
+@@ -45722,8 +50008,13 @@
/* end confdefs.h. */
#include <libraw1394/raw1394.h>
_ACEOF
@@ -47760,7 +48411,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -45750,9 +49906,10 @@
+@@ -45747,9 +50038,10 @@
ac_header_preproc=no
fi
@@ -47773,7 +48424,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -45776,25 +49933,18 @@
+@@ -45773,25 +50065,18 @@
echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
@@ -47804,7 +48455,7 @@
fi
if test $ac_cv_header_libraw1394_raw1394_h = yes; then
-@@ -45835,9 +49985,9 @@
+@@ -45832,9 +50117,9 @@
for ac_func in sigset sigaction
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -47817,7 +48468,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -45863,53 +50013,59 @@
+@@ -45860,53 +50145,59 @@
#undef $ac_func
@@ -47896,7 +48547,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -45918,13 +50074,15 @@
+@@ -45915,13 +50206,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -47905,7 +48556,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
@@ -47916,7 +48567,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -45940,19 +50098,18 @@
+@@ -45937,19 +50230,18 @@
LIB_XSS=
@@ -47940,7 +48591,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'
-@@ -45961,8 +50118,8 @@
+@@ -45958,8 +50250,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -47951,7 +48602,7 @@
if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -45979,24 +50136,36 @@
+@@ -45976,24 +50268,36 @@
#include <X11/extensions/scrnsaver.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -47996,7 +48647,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46005,16 +50174,17 @@
+@@ -46002,16 +50306,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48020,7 +48671,7 @@
if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46027,40 +50197,52 @@
+@@ -46024,40 +50329,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48085,7 +48736,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46069,14 +50251,15 @@
+@@ -46066,14 +50383,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48094,7 +48745,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
@@ -48105,7 +48756,7 @@
if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
-@@ -46092,16 +50275,15 @@
+@@ -46089,16 +50407,15 @@
xss_save_cxxflags="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
@@ -48126,7 +48777,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'
-@@ -46128,24 +50310,36 @@
+@@ -46125,24 +50442,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48171,7 +48822,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46154,11 +50348,13 @@
+@@ -46151,11 +50480,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48179,7 +48830,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
@@ -48187,7 +48838,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'
-@@ -46168,19 +50364,19 @@
+@@ -46165,19 +50496,19 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -48213,7 +48864,7 @@
if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46193,40 +50389,52 @@
+@@ -46190,40 +50521,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48278,7 +48929,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46235,14 +50443,15 @@
+@@ -46232,14 +50575,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48287,7 +48938,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
@@ -48298,7 +48949,7 @@
if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
-@@ -46284,8 +50493,7 @@
+@@ -46281,8 +50625,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -48308,7 +48959,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'
-@@ -46294,8 +50502,8 @@
+@@ -46291,8 +50634,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -48319,7 +48970,7 @@
if test "${ac_cv_header_X11_extensions_xf86misc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46312,24 +50520,36 @@
+@@ -46309,24 +50652,36 @@
#include <X11/extensions/xf86misc.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -48364,7 +49015,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46338,16 +50558,17 @@
+@@ -46335,16 +50690,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48388,7 +49039,7 @@
if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46360,40 +50581,52 @@
+@@ -46357,40 +50713,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48453,7 +49104,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46402,14 +50635,15 @@
+@@ -46399,14 +50767,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48462,7 +49113,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
@@ -48473,7 +49124,7 @@
if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
-@@ -46436,8 +50670,8 @@
+@@ -46433,8 +50802,8 @@
if test -n "$LIB_XF86MISC"; then
@@ -48484,7 +49135,7 @@
if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46450,40 +50684,52 @@
+@@ -46447,40 +50816,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48549,7 +49200,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46492,14 +50738,15 @@
+@@ -46489,14 +50870,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48558,7 +49209,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
@@ -48569,7 +49220,7 @@
if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
-@@ -46520,28 +50767,27 @@
+@@ -46517,28 +50899,27 @@
test -z "$GL_INCLUDE" && GL_INCLUDE=
@@ -48605,7 +49256,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'
-@@ -46577,24 +50823,36 @@
+@@ -46574,24 +50955,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48650,7 +49301,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46603,9 +50861,10 @@
+@@ -46600,9 +50993,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48659,11 +49310,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'
-@@ -46620,8 +50879,8 @@
+@@ -46617,8 +51011,8 @@
fi
if test "$ac_cv_have_gl" = "no"; then
@@ -48674,7 +49325,7 @@
GL_LDFLAGS=""
GLINC=""
-@@ -46642,11 +50901,11 @@
+@@ -46639,11 +51033,11 @@
else
GLINC="-I$GL_INCLUDE"
fi
@@ -48690,7 +49341,7 @@
if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -46659,40 +50918,52 @@
+@@ -46656,40 +51050,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -48755,7 +49406,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46701,14 +50972,15 @@
+@@ -46698,14 +51104,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48764,7 +49415,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
@@ -48775,7 +49426,7 @@
if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-@@ -46726,8 +50998,8 @@
+@@ -46723,8 +51130,8 @@
@@ -48786,7 +49437,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46749,15 +51021,15 @@
+@@ -46746,15 +51153,15 @@
#define HAVE_STRUCT_UCRED 1
_ACEOF
@@ -48808,7 +49459,7 @@
if test "$cross_compiling" = yes; then
nogroup=65534
else
-@@ -46780,13 +51052,22 @@
+@@ -46777,13 +51184,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -48835,7 +49486,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46819,13 +51100,22 @@
+@@ -46816,13 +51232,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -48862,7 +49513,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46838,21 +51128,25 @@
+@@ -46835,21 +51260,25 @@
( exit $ac_status )
nogroup=65534
fi
@@ -48895,7 +49546,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -46878,53 +51172,59 @@
+@@ -46875,53 +51304,59 @@
#undef $ac_func
@@ -48974,7 +49625,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -46933,13 +51233,15 @@
+@@ -46930,13 +51365,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -48983,7 +49634,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
@@ -48994,7 +49645,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -46950,14 +51252,14 @@
+@@ -46947,14 +51384,14 @@
@@ -49012,7 +49663,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47000,21 +51302,21 @@
+@@ -46997,21 +51434,21 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -49040,7 +49691,7 @@
imkv=8
test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
if test "${kde_cv_defines_imake+set}" = set; then
-@@ -47034,8 +51336,8 @@
+@@ -47031,8 +51468,8 @@
kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
kde_cv_defines_imake_version=$imkv
else
@@ -49051,7 +49702,7 @@
{ { echo "$as_me:$LINENO: error: $XMKMF (imake) failed.
Make sure you have all necessary X development packages installed.
On some systems a missing /lib/cpp symlink is at fault." >&5
-@@ -47047,8 +51349,8 @@
+@@ -47044,8 +51481,8 @@
cd ..
rm -fr conftestdir
else
@@ -49062,7 +49713,7 @@
{ { echo "$as_me:$LINENO: error: cannot create temporary directory" >&5
echo "$as_me: error: cannot create temporary directory" >&2;}
{ (exit 1); exit 1; }; }
-@@ -47056,8 +51358,8 @@
+@@ -47053,8 +51490,8 @@
fi
@@ -49073,7 +49724,7 @@
eval "$kde_cv_defines_imake"
cat >>confdefs.h <<_ACEOF
-@@ -47082,9 +51384,9 @@
+@@ -47079,9 +51516,9 @@
for ac_func in getttyent
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -49086,7 +49737,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47110,53 +51412,59 @@
+@@ -47107,53 +51544,59 @@
#undef $ac_func
@@ -49165,7 +49816,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47165,13 +51473,15 @@
+@@ -47162,13 +51605,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49174,7 +49825,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
@@ -49185,7 +49836,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47184,8 +51494,8 @@
+@@ -47181,8 +51626,8 @@
linux*) ac_cv_func_getutxent=no;;
darwin*) ac_cv_func_getutxent=no;;
kfreebsd*-gnu) ac_cv_func_getutxent=no;;
@@ -49196,7 +49847,7 @@
if test "${ac_cv_func_getutxent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47212,53 +51522,59 @@
+@@ -47209,53 +51654,59 @@
#undef getutxent
@@ -49275,7 +49926,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47267,13 +51583,14 @@
+@@ -47264,13 +51715,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49284,7 +49935,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_getutxent" >&5
@@ -49294,7 +49945,7 @@
;;
esac
if test $ac_cv_func_getutxent = yes; then
-@@ -47283,8 +51600,8 @@
+@@ -47280,8 +51732,8 @@
_ACEOF
else
@@ -49305,7 +49956,7 @@
if test "${ac_cv_func_getutent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47311,53 +51628,59 @@
+@@ -47308,53 +51760,59 @@
#undef getutent
@@ -49384,7 +50035,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47366,13 +51689,14 @@
+@@ -47363,13 +51821,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49393,7 +50044,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_getutent" >&5
@@ -49403,7 +50054,7 @@
if test $ac_cv_func_getutent = yes; then
:
else
-@@ -47385,8 +51709,8 @@
+@@ -47382,8 +51841,8 @@
fi
@@ -49414,7 +50065,7 @@
if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47409,24 +51733,36 @@
+@@ -47406,24 +51865,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49459,7 +50110,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47435,7 +51771,7 @@
+@@ -47432,7 +51903,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49468,7 +50119,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -47454,24 +51790,36 @@
+@@ -47451,24 +51922,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49513,7 +50164,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47480,14 +51828,16 @@
+@@ -47477,14 +51960,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49535,7 +50186,7 @@
if test $ac_cv_member_struct_utmp_ut_user = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -47497,8 +51847,8 @@
+@@ -47494,8 +51979,8 @@
fi
@@ -49546,7 +50197,7 @@
if test "${ac_cv_member_struct_passwd_pw_expire+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47521,24 +51871,36 @@
+@@ -47518,24 +52003,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49591,7 +50242,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47547,7 +51909,7 @@
+@@ -47544,7 +52041,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49600,7 +50251,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -47566,24 +51928,36 @@
+@@ -47563,24 +52060,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49645,7 +50296,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47592,14 +51966,16 @@
+@@ -47589,14 +52098,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49667,7 +50318,7 @@
if test $ac_cv_member_struct_passwd_pw_expire = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -47609,8 +51985,8 @@
+@@ -47606,8 +52117,8 @@
fi
@@ -49678,7 +50329,7 @@
if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -47636,24 +52012,36 @@
+@@ -47633,24 +52144,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49723,7 +50374,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47662,7 +52050,7 @@
+@@ -47659,7 +52182,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49732,7 +50383,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -47684,24 +52072,36 @@
+@@ -47681,24 +52204,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -49777,7 +50428,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47710,14 +52110,16 @@
+@@ -47707,14 +52242,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49799,7 +50450,7 @@
if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -47738,9 +52140,9 @@
+@@ -47735,9 +52272,9 @@
for ac_func in setlogin setusercontext getusershell login_getclass auth_timeok
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -49812,7 +50463,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47766,53 +52168,59 @@
+@@ -47763,53 +52300,59 @@
#undef $ac_func
@@ -49891,7 +50542,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47821,13 +52229,15 @@
+@@ -47818,13 +52361,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -49900,7 +50551,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
@@ -49911,7 +50562,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47846,9 +52256,9 @@
+@@ -47843,9 +52388,9 @@
for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -49924,7 +50575,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47874,53 +52284,59 @@
+@@ -47871,53 +52416,59 @@
#undef $ac_func
@@ -50003,7 +50654,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -47929,13 +52345,15 @@
+@@ -47926,13 +52477,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50012,7 +50663,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
@@ -50023,7 +50674,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47949,9 +52367,9 @@
+@@ -47946,9 +52499,9 @@
for ac_func in arc4random
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -50036,7 +50687,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -47977,53 +52395,59 @@
+@@ -47974,53 +52527,59 @@
#undef $ac_func
@@ -50115,7 +50766,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48032,13 +52456,15 @@
+@@ -48029,13 +52588,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50124,7 +50775,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
@@ -50135,7 +50786,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -48061,8 +52487,8 @@
+@@ -48058,8 +52619,8 @@
done
@@ -50146,7 +50797,7 @@
if test "${ac_cv_func_vsyslog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48089,53 +52515,59 @@
+@@ -48086,53 +52647,59 @@
#undef vsyslog
@@ -50225,7 +50876,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48144,13 +52576,14 @@
+@@ -48141,13 +52708,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50234,7 +50885,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_vsyslog" >&5
@@ -50244,7 +50895,7 @@
if test $ac_cv_func_vsyslog = yes; then
-@@ -48164,8 +52597,8 @@
+@@ -48161,8 +52729,8 @@
kdm_no_Xau=false
kdm_no_Xdmcp=false
@@ -50255,7 +50906,7 @@
if test "${ac_cv_lib_Xau_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48182,30 +52615,42 @@
+@@ -48179,30 +52747,42 @@
int
main ()
{
@@ -50307,7 +50958,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48214,14 +52659,15 @@
+@@ -48211,14 +52791,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50316,7 +50967,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
@@ -50327,7 +50978,7 @@
if test $ac_cv_lib_Xau_main = yes; then
:
else
-@@ -48233,16 +52679,16 @@
+@@ -48230,16 +52811,16 @@
@@ -50350,7 +51001,7 @@
if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48259,30 +52705,42 @@
+@@ -48256,30 +52837,42 @@
int
main ()
{
@@ -50402,7 +51053,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48291,14 +52749,15 @@
+@@ -48288,14 +52881,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50411,7 +51062,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
@@ -50422,7 +51073,7 @@
if test $ac_cv_lib_Xdmcp_main = yes; then
LIBXDMCP="-lXdmcp"
fi
-@@ -48306,8 +52765,8 @@
+@@ -48303,8 +52897,8 @@
if test -n "$LIBXDMCP"; then
cppflags_safe=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_INCLUDES"
@@ -50433,7 +51084,7 @@
if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48322,24 +52781,36 @@
+@@ -48319,24 +52913,36 @@
#include <X11/Xdmcp.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -50478,7 +51129,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48348,12 +52819,13 @@
+@@ -48345,12 +52951,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50496,7 +51147,7 @@
if test $ac_cv_header_X11_Xdmcp_h = yes; then
HAVE_X11_XDMCP_H=1
fi
-@@ -48372,8 +52844,8 @@
+@@ -48369,8 +52976,8 @@
ac_save_libs=$LIBS
LIBS="$LIBS $LIBXDMCP"
@@ -50507,7 +51158,7 @@
if test "${ac_cv_func_XdmcpWrap+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48400,53 +52872,59 @@
+@@ -48397,53 +53004,59 @@
#undef XdmcpWrap
@@ -50586,7 +51237,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48455,13 +52933,14 @@
+@@ -48452,13 +53065,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50595,7 +51246,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_XdmcpWrap" >&5
@@ -50605,7 +51256,7 @@
if test $ac_cv_func_XdmcpWrap = yes; then
-@@ -48480,25 +52959,25 @@
+@@ -48477,25 +53091,25 @@
KRB4_LIBS=
KRB4_RPATH=
@@ -50641,7 +51292,7 @@
cat >>confdefs.h <<_ACEOF
#define KRB4 1
-@@ -48509,8 +52988,8 @@
+@@ -48506,8 +53120,8 @@
if test "$USE_RPATH" = "yes" ; then
KRB4_RPATH="-R $with_krb4/lib"
fi
@@ -50652,7 +51303,7 @@
if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48523,40 +53002,52 @@
+@@ -48520,40 +53134,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -50717,7 +51368,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48565,14 +53056,15 @@
+@@ -48562,14 +53188,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50726,7 +51377,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
@@ -50737,7 +51388,7 @@
if test $ac_cv_lib_resolv_dn_expand = yes; then
KRB4_LIBS="$KRB4_LIBS -lresolv"
fi
-@@ -48580,29 +53072,29 @@
+@@ -48577,29 +53204,29 @@
;;
esac
@@ -50779,7 +51430,7 @@
cat >>confdefs.h <<_ACEOF
#define AFS 1
-@@ -48619,8 +53111,8 @@
+@@ -48616,8 +53243,8 @@
@@ -50790,7 +51441,7 @@
if test "${ac_cv_lib_s_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48637,30 +53129,42 @@
+@@ -48634,30 +53261,42 @@
int
main ()
{
@@ -50842,7 +51493,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48669,21 +53173,22 @@
+@@ -48666,21 +53305,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50851,7 +51502,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
@@ -50871,7 +51522,7 @@
if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -48696,40 +53201,52 @@
+@@ -48693,40 +53333,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -50936,7 +51587,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48738,14 +53255,15 @@
+@@ -48735,14 +53387,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -50945,7 +51596,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
@@ -50956,7 +51607,7 @@
if test $ac_cv_lib_posix4_sched_yield = yes; then
LIBPOSIX4=-lposix4
fi
-@@ -48756,22 +53274,22 @@
+@@ -48753,22 +53406,22 @@
KRB5_LIBS=
KRB5_RPATH=
@@ -50989,7 +51640,7 @@
if test "x$with_krb5auth" != xyes; then
KRB5_INCS="-I$with_krb5auth/include"
KRB5_LIBS="-L$with_krb5auth/lib"
-@@ -48782,17 +53300,17 @@
+@@ -48779,17 +53432,17 @@
KRB5_LIBS="$KRB5_LIBS -lkrb5" keepcflags=$CFLAGS
CFLAGS="$KRB5_INCS $CFLAGS"
if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
@@ -51013,7 +51664,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48803,24 +53321,36 @@
+@@ -48800,24 +53453,36 @@
#include <krb5/krb5.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -51058,7 +51709,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -48829,15 +53359,16 @@
+@@ -48826,15 +53491,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51081,7 +51732,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48846,8 +53377,13 @@
+@@ -48843,8 +53509,13 @@
/* end confdefs.h. */
#include <krb5/krb5.h>
_ACEOF
@@ -51097,7 +51748,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -48871,9 +53407,10 @@
+@@ -48868,9 +53539,10 @@
ac_header_preproc=no
fi
@@ -51110,7 +51761,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -48897,25 +53434,18 @@
+@@ -48894,25 +53566,18 @@
echo "$as_me: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&2;}
@@ -51141,7 +51792,7 @@
fi
if test $ac_cv_header_krb5_krb5_h = yes; then
-@@ -48942,34 +53472,34 @@
+@@ -48939,34 +53604,34 @@
@@ -51192,7 +51843,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -48980,24 +53510,36 @@
+@@ -48977,24 +53642,36 @@
#include <rpc/rpc.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -51237,7 +51888,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49006,15 +53548,16 @@
+@@ -49003,15 +53680,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51260,7 +51911,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49023,8 +53566,13 @@
+@@ -49020,8 +53698,13 @@
/* end confdefs.h. */
#include <rpc/rpc.h>
_ACEOF
@@ -51276,7 +51927,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -49048,9 +53596,10 @@
+@@ -49045,9 +53728,10 @@
ac_header_preproc=no
fi
@@ -51289,7 +51940,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -49074,25 +53623,18 @@
+@@ -49071,25 +53755,18 @@
echo "$as_me: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&2;}
@@ -51320,7 +51971,7 @@
fi
if test $ac_cv_header_rpc_rpc_h = yes; then
-@@ -49139,13 +53681,13 @@
+@@ -49136,13 +53813,13 @@
fi
@@ -51338,7 +51989,7 @@
if test "x$with_kdm_xconsole" = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -49157,16 +53699,15 @@
+@@ -49154,16 +53831,15 @@
@@ -51358,7 +52009,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'
-@@ -49207,13 +53748,22 @@
+@@ -49204,13 +53880,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -51385,7 +52036,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49224,8 +53774,10 @@
+@@ -49221,8 +53906,10 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -51397,7 +52048,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -49237,16 +53789,16 @@
+@@ -49234,16 +53921,16 @@
if test "$kde_cv_covariant_return" = "no"; then
@@ -51418,7 +52069,7 @@
fi
-@@ -49255,8 +53807,8 @@
+@@ -49252,8 +53939,8 @@
artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
@@ -51429,7 +52080,7 @@
if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49271,29 +53823,30 @@
+@@ -49268,29 +53955,30 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -51466,7 +52117,7 @@
if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
LIB_ARTS="-lartskde"
ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
-@@ -49324,18 +53877,19 @@
+@@ -49321,18 +54009,19 @@
for ac_header in sys/loadavg.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -51494,7 +52145,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49346,24 +53900,36 @@
+@@ -49343,24 +54032,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -51539,7 +52190,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49372,15 +53938,16 @@
+@@ -49369,15 +54070,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51562,7 +52213,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -49389,8 +53956,13 @@
+@@ -49386,8 +54088,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -51578,7 +52229,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -49414,9 +53986,10 @@
+@@ -49411,9 +54118,10 @@
ac_header_preproc=no
fi
@@ -51591,7 +52242,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -49440,25 +54013,19 @@
+@@ -49437,25 +54145,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;}
@@ -51624,7 +52275,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -49476,8 +54043,7 @@
+@@ -49473,8 +54175,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -51634,7 +52285,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'
-@@ -49486,8 +54052,8 @@
+@@ -49483,8 +54184,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -51645,7 +52296,7 @@
if test "${ac_cv_header_X11_extensions_Xcomposite_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49502,24 +54068,36 @@
+@@ -49499,24 +54200,36 @@
#include <X11/extensions/Xcomposite.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -51690,7 +52341,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49528,12 +54106,13 @@
+@@ -49525,12 +54238,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51708,7 +52359,7 @@
if test $ac_cv_header_X11_extensions_Xcomposite_h = yes; then
xcomposite_h=yes
else
-@@ -49559,8 +54138,8 @@
+@@ -49556,8 +54270,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -51719,7 +52370,7 @@
if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49573,40 +54152,52 @@
+@@ -49570,40 +54284,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -51784,7 +52435,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49615,14 +54206,15 @@
+@@ -49612,14 +54338,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51793,7 +52444,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
@@ -51804,7 +52455,7 @@
if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
LIB_XCOMPOSITE=-lXcomposite
-@@ -49646,8 +54238,7 @@
+@@ -49643,8 +54370,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -51814,7 +52465,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'
-@@ -49656,8 +54247,8 @@
+@@ -49653,8 +54379,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -51825,7 +52476,7 @@
if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49672,24 +54263,36 @@
+@@ -49669,24 +54395,36 @@
#include <X11/extensions/Xfixes.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -51870,7 +52521,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49698,12 +54301,13 @@
+@@ -49695,12 +54433,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51888,7 +52539,7 @@
if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
xfixes_h=yes
else
-@@ -49729,8 +54333,8 @@
+@@ -49726,8 +54465,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -51899,7 +52550,7 @@
if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -49743,40 +54347,52 @@
+@@ -49740,40 +54479,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -51964,7 +52615,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49785,14 +54401,15 @@
+@@ -49782,14 +54533,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -51973,7 +52624,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
@@ -51984,7 +52635,7 @@
if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
LIB_XFIXES=-lXfixes
-@@ -49819,26 +54436,26 @@
+@@ -49816,26 +54568,26 @@
ssl_libraries=""
ssl_includes=""
@@ -52021,16 +52672,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -49853,7 +54470,7 @@
+@@ -49850,7 +54602,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 49856: $i/$j" >&5
-+ echo "configure: 54473: $i/$j" >&5
+- echo "configure: 49853: $i/$j" >&5
++ echo "configure: 54605: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -49900,24 +54517,36 @@
+@@ -49897,24 +54649,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52075,7 +52726,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -49927,10 +54556,11 @@
+@@ -49924,10 +54688,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52085,11 +52736,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"
-@@ -49948,26 +54578,26 @@
+@@ -49945,26 +54710,26 @@
eval "$ac_cv_have_ssl"
@@ -52129,7 +52780,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50040,8 +54670,8 @@
+@@ -50037,8 +54802,8 @@
eval "$ac_cv_ssl_version"
@@ -52140,7 +52791,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -50100,10 +54730,9 @@
+@@ -50097,10 +54862,9 @@
@@ -52152,7 +52803,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'
-@@ -50116,18 +54745,19 @@
+@@ -50113,18 +54877,19 @@
for ac_header in sasl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52180,7 +52831,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50138,24 +54768,36 @@
+@@ -50135,24 +54900,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -52225,7 +52876,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50164,15 +54806,16 @@
+@@ -50161,15 +54938,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52248,7 +52899,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50181,8 +54824,13 @@
+@@ -50178,8 +54956,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -52264,7 +52915,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -50206,9 +54854,10 @@
+@@ -50203,9 +54986,10 @@
ac_header_preproc=no
fi
@@ -52277,7 +52928,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -50232,25 +54881,19 @@
+@@ -50229,25 +55013,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;}
@@ -52310,7 +52961,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -50273,10 +54916,9 @@
+@@ -50270,10 +55048,9 @@
@@ -52322,7 +52973,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'
-@@ -50289,18 +54931,19 @@
+@@ -50286,18 +55063,19 @@
for ac_header in sasl/sasl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52350,7 +53001,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50311,24 +54954,36 @@
+@@ -50308,24 +55086,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -52395,7 +53046,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50337,15 +54992,16 @@
+@@ -50334,15 +55124,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52418,7 +53069,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50354,8 +55010,13 @@
+@@ -50351,8 +55142,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -52434,7 +53085,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -50379,9 +55040,10 @@
+@@ -50376,9 +55172,10 @@
ac_header_preproc=no
fi
@@ -52447,7 +53098,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -50405,25 +55067,19 @@
+@@ -50402,25 +55199,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;}
@@ -52480,7 +53131,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -50453,8 +55109,8 @@
+@@ -50450,8 +55241,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -52491,7 +53142,7 @@
if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -50467,40 +55123,52 @@
+@@ -50464,40 +55255,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -52556,7 +53207,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50509,14 +55177,15 @@
+@@ -50506,14 +55309,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52565,7 +53216,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
@@ -52576,7 +53227,7 @@
if test $ac_cv_lib_sasl2_sasl_client_init = yes; then
SASL2_LIBS="-lsasl2"
fi
-@@ -50536,15 +55205,14 @@
+@@ -50533,15 +55337,14 @@
@@ -52595,7 +53246,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'
-@@ -50576,24 +55244,36 @@
+@@ -50573,24 +55376,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52640,7 +53291,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50602,9 +55282,10 @@
+@@ -50599,9 +55414,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52649,11 +53300,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"
CXXFLAGS="$kde_save_CXXFLAGS"
-@@ -50616,8 +55297,8 @@
+@@ -50613,8 +55429,8 @@
fi
@@ -52664,7 +53315,7 @@
if test ! "$ac_cv_lib_bzip2" = no; then
BZIP2DIR=bzip2
-@@ -50630,16 +55311,15 @@
+@@ -50627,16 +55443,15 @@
cxx_shared_flag=
ld_shared_flag=
@@ -52685,7 +53336,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'
-@@ -50666,24 +55346,36 @@
+@@ -50663,24 +55478,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52730,7 +53381,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50692,8 +55384,10 @@
+@@ -50689,8 +55516,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52738,11 +53389,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
-@@ -50706,30 +55400,29 @@
+@@ -50703,30 +55532,29 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -52781,7 +53432,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'
-@@ -50756,24 +55449,36 @@
+@@ -50753,24 +55581,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52826,7 +53477,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50782,8 +55487,10 @@
+@@ -50779,8 +55619,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52834,11 +53485,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
-@@ -50796,29 +55503,28 @@
+@@ -50793,29 +55635,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -52875,7 +53526,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'
-@@ -50851,24 +55557,36 @@
+@@ -50848,24 +55689,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52920,7 +53571,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50877,9 +55595,10 @@
+@@ -50874,9 +55727,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -52929,11 +53580,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"
CXXFLAGS="$kde_save_CXXFLAGS"
-@@ -50892,8 +55611,8 @@
+@@ -50889,8 +55743,8 @@
fi
@@ -52944,7 +53595,7 @@
if test ! "$ac_cv_lib_bzip2_prefix" = no; then
BZIP2DIR=bzip2
-@@ -50934,18 +55653,19 @@
+@@ -50931,18 +55785,19 @@
for ac_header in termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52972,7 +53623,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50956,24 +55676,36 @@
+@@ -50953,24 +55808,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -53017,7 +53668,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -50982,15 +55714,16 @@
+@@ -50979,15 +55846,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53040,7 +53691,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -50999,8 +55732,13 @@
+@@ -50996,8 +55864,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -53056,7 +53707,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -51024,9 +55762,10 @@
+@@ -51021,9 +55894,10 @@
ac_header_preproc=no
fi
@@ -53069,7 +53720,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -51050,25 +55789,19 @@
+@@ -51047,25 +55921,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;}
@@ -53102,7 +53753,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -51089,9 +55822,9 @@
+@@ -51086,9 +55954,9 @@
for ac_func in getpt openpty isastream
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53115,7 +53766,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -51117,53 +55850,59 @@
+@@ -51114,53 +55982,59 @@
#undef $ac_func
@@ -53194,7 +53845,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51172,13 +55911,15 @@
+@@ -51169,13 +56043,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53203,7 +53854,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
@@ -53214,7 +53865,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -51189,13 +55930,12 @@
+@@ -51186,13 +56062,12 @@
LIBS="$kde_save_LIBS"
@@ -53232,7 +53883,7 @@
yes)
with_ldap=CHECK
;;
-@@ -51203,7 +55943,8 @@
+@@ -51200,7 +56075,8 @@
else
with_ldap=CHECK
@@ -53242,25 +53893,25 @@
if test "x$with_ldap" = "xCHECK" ; then
with_ldap=NOTFOUND
search_incs="$kde_includes /usr/include /usr/local/include"
-@@ -51213,7 +55954,7 @@
+@@ -51210,7 +56086,7 @@
do
for j in ldap.h;
do
-- echo "configure: 51216: $i/$j" >&5
-+ echo "configure: 55957: $i/$j" >&5
+- echo "configure: 51213: $i/$j" >&5
++ echo "configure: 56089: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -51235,7 +55976,7 @@
+@@ -51232,7 +56108,7 @@
do
for j in libldap.$ext;
do
-- echo "configure: 51238: $i/$j" >&5
-+ echo "configure: 55979: $i/$j" >&5
+- echo "configure: 51235: $i/$j" >&5
++ echo "configure: 56111: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -51258,8 +55999,8 @@
+@@ -51255,8 +56131,8 @@
fi
case "$with_ldap" in
@@ -53271,7 +53922,7 @@
framework)
LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
-@@ -51268,18 +56009,18 @@
+@@ -51265,18 +56141,18 @@
_ACEOF
LDAP_SUBDIR="ldap"
@@ -53298,7 +53949,7 @@
;;
esac
-@@ -51293,8 +56034,8 @@
+@@ -51290,8 +56166,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -53309,7 +53960,7 @@
if test "${ac_cv_lib_lber_ber_alloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51307,40 +56048,52 @@
+@@ -51304,40 +56180,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -53374,7 +54025,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51349,14 +56102,15 @@
+@@ -51346,14 +56234,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53383,7 +54034,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
@@ -53394,7 +54045,7 @@
if test $ac_cv_lib_lber_ber_alloc = yes; then
LIB_LBER=-llber
fi
-@@ -51366,8 +56120,8 @@
+@@ -51363,8 +56252,8 @@
@@ -53405,7 +54056,7 @@
if test "x$with_ldap" != "xFOUND" ; then
LDAP_ROOT="$with_ldap"
-@@ -51387,7 +56141,6 @@
+@@ -51384,7 +56273,6 @@
LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS"
@@ -53413,7 +54064,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -51417,24 +56170,36 @@
+@@ -51414,24 +56302,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -53458,7 +54109,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51443,10 +56208,11 @@
+@@ -51440,10 +56340,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53468,11 +54119,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'
-@@ -51461,8 +56227,8 @@
+@@ -51458,8 +56359,8 @@
LDAP_LIBS=
LDAP_RPATH=
LDAP_SUBDIR=
@@ -53483,7 +54134,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -51470,8 +56236,8 @@
+@@ -51467,8 +56368,8 @@
_ACEOF
LDAP_SUBDIR="ldap"
@@ -53494,7 +54145,7 @@
fi
-@@ -51492,17 +56258,17 @@
+@@ -51489,17 +56390,17 @@
########### Check for linux/cdrom.h
if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
@@ -53518,7 +54169,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51513,24 +56279,36 @@
+@@ -51510,24 +56411,36 @@
#include <linux/cdrom.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -53563,7 +54214,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -51539,15 +56317,16 @@
+@@ -51536,15 +56449,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -53586,7 +54237,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -51556,8 +56335,13 @@
+@@ -51553,8 +56467,13 @@
/* end confdefs.h. */
#include <linux/cdrom.h>
_ACEOF
@@ -53602,7 +54253,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -51581,9 +56365,10 @@
+@@ -51578,9 +56497,10 @@
ac_header_preproc=no
fi
@@ -53615,7 +54266,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -51607,25 +56392,18 @@
+@@ -51604,25 +56524,18 @@
echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
@@ -53646,7 +54297,7 @@
fi
if test $ac_cv_header_linux_cdrom_h = yes; then
-@@ -51644,19 +56422,19 @@
+@@ -51641,19 +56554,19 @@
@@ -53672,25 +54323,25 @@
hal_inc=NOTFOUND
hal_lib=NOTFOUND
-@@ -51669,7 +56447,7 @@
+@@ -51666,7 +56579,7 @@
do
for j in libhal.h libhal-storage.h;
do
-- echo "configure: 51672: $i/$j" >&5
-+ echo "configure: 56450: $i/$j" >&5
+- echo "configure: 51669: $i/$j" >&5
++ echo "configure: 56582: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -51691,7 +56469,7 @@
+@@ -51688,7 +56601,7 @@
do
for j in libhal.so libhal-storage.so;
do
-- echo "configure: 51694: $i/$j" >&5
-+ echo "configure: 56472: $i/$j" >&5
+- echo "configure: 51691: $i/$j" >&5
++ echo "configure: 56604: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -51720,8 +56498,8 @@
+@@ -51717,8 +56630,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
@@ -53701,7 +54352,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51736,28 +56514,29 @@
+@@ -51733,28 +56646,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53737,7 +54388,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -51768,25 +56547,25 @@
+@@ -51765,25 +56679,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -53775,7 +54426,7 @@
else
HAL_CFLAGS=""
HAL_LIBS=""
-@@ -51807,20 +56586,20 @@
+@@ -51804,20 +56718,20 @@
if test $succeeded = yes; then
HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND;
else
@@ -53802,7 +54453,7 @@
fi
-@@ -51830,8 +56609,8 @@
+@@ -51827,8 +56741,8 @@
########### Check for DBus
@@ -53813,34 +54464,34 @@
dbus_inc=NOTFOUND
dbus_lib=NOTFOUND
-@@ -51844,7 +56623,7 @@
+@@ -51841,7 +56755,7 @@
do
for j in dbus/dbus.h;
do
-- echo "configure: 51847: $i/$j" >&5
-+ echo "configure: 56626: $i/$j" >&5
+- echo "configure: 51844: $i/$j" >&5
++ echo "configure: 56758: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -51861,7 +56640,7 @@
+@@ -51858,7 +56772,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
-- echo "configure: 51864: $i/$j" >&5
-+ echo "configure: 56643: $i/$j" >&5
+- echo "configure: 51861: $i/$j" >&5
++ echo "configure: 56775: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -51883,7 +56662,7 @@
+@@ -51880,7 +56794,7 @@
do
for j in libdbus-1.so;
do
-- echo "configure: 51886: $i/$j" >&5
-+ echo "configure: 56665: $i/$j" >&5
+- echo "configure: 51883: $i/$j" >&5
++ echo "configure: 56797: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -51912,8 +56691,8 @@
+@@ -51909,8 +56823,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
@@ -53851,7 +54502,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -51928,28 +56707,29 @@
+@@ -51925,28 +56839,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53887,7 +54538,7 @@
fi
if test "$PKG_CONFIG" = "no" ; then
-@@ -51960,25 +56740,25 @@
+@@ -51957,25 +56872,25 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -53925,7 +54576,7 @@
else
DBUS_CFLAGS=""
DBUS_LIBS=""
-@@ -51999,8 +56779,8 @@
+@@ -51996,8 +56911,8 @@
if test $succeeded = yes; then
DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND;
else
@@ -53936,7 +54587,7 @@
fi
-@@ -52017,12 +56797,12 @@
+@@ -52014,12 +56929,12 @@
if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
@@ -53953,54 +54604,54 @@
fi
-@@ -52030,8 +56810,8 @@
+@@ -52027,8 +56942,8 @@
- ########### Check for DBus-Qt bindings
+ ########### Check for DBus-Qt3 bindings
-- echo "$as_me:$LINENO: checking for DBus-Qt bindings" >&5
--echo $ECHO_N "checking for DBus-Qt bindings... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for DBus-Qt bindings" >&5
-+echo $ECHO_N "checking for DBus-Qt bindings... $ECHO_C" >&6; }
+- echo "$as_me:$LINENO: checking for DBus-Qt3 bindings" >&5
+-echo $ECHO_N "checking for DBus-Qt3 bindings... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for DBus-Qt3 bindings" >&5
++echo $ECHO_N "checking for DBus-Qt3 bindings... $ECHO_C" >&6; }
dbusqt_inc=NOTFOUND
dbusqt_lib=NOTFOUND
-@@ -52044,7 +56824,7 @@
+@@ -52041,7 +56956,7 @@
do
for j in dbus/connection.h;
do
-- echo "configure: 52047: $i/$j" >&5
-+ echo "configure: 56827: $i/$j" >&5
+- echo "configure: 52044: $i/$j" >&5
++ echo "configure: 56959: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -52071,7 +56851,7 @@
+@@ -52068,7 +56983,7 @@
do
for j in libdbus-qt-1.so;
do
-- echo "configure: 52074: $i/$j" >&5
-+ echo "configure: 56854: $i/$j" >&5
+- echo "configure: 52071: $i/$j" >&5
++ echo "configure: 56986: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -52095,7 +56875,7 @@
+@@ -52092,7 +57007,7 @@
do
for j in dbus/connection.h;
do
-- echo "configure: 52098: $i/$j" >&5
-+ echo "configure: 56878: $i/$j" >&5
+- echo "configure: 52095: $i/$j" >&5
++ echo "configure: 57010: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -52121,7 +56901,7 @@
+@@ -52118,7 +57033,7 @@
do
for j in libdbus-qt-1.so;
do
-- echo "configure: 52124: $i/$j" >&5
-+ echo "configure: 56904: $i/$j" >&5
+- echo "configure: 52121: $i/$j" >&5
++ echo "configure: 57036: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -52140,12 +56920,12 @@
+@@ -52137,12 +57052,12 @@
if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
@@ -54017,7 +54668,7 @@
fi
-@@ -52154,8 +56934,8 @@
+@@ -52151,8 +57066,8 @@
########### Check if media HAL backend sould be compiled
@@ -54028,7 +54679,7 @@
HALBACKEND=no
if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
-@@ -52166,11 +56946,11 @@
+@@ -52163,11 +57078,11 @@
HALBACKEND=yes
@@ -54044,7 +54695,7 @@
fi
-@@ -52197,15 +56977,15 @@
+@@ -52194,15 +57109,15 @@
@@ -54065,7 +54716,7 @@
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52213,8 +56993,8 @@
+@@ -52210,8 +57125,8 @@
if test "$GCC" != yes; then
ac_save_CC=$CC
while :; do
@@ -54076,7 +54727,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52238,25 +57018,37 @@
+@@ -52235,25 +57150,37 @@
return 0;
}
_ACEOF
@@ -54123,7 +54774,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52265,28 +57057,42 @@
+@@ -52262,28 +57189,42 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54177,7 +54828,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52295,22 +57101,24 @@
+@@ -52292,22 +57233,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54207,7 +54858,7 @@
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52340,24 +57148,36 @@
+@@ -52337,24 +57280,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -54252,7 +54903,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52366,8 +57186,10 @@
+@@ -52363,8 +57318,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54264,7 +54915,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52393,24 +57215,36 @@
+@@ -52390,24 +57347,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -54309,7 +54960,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52419,13 +57253,15 @@
+@@ -52416,13 +57385,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54328,7 +54979,7 @@
if test "$ac_cv_sys_file_offset_bits" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -52434,8 +57270,8 @@
+@@ -52431,8 +57402,8 @@
fi
rm -f conftest*
@@ -54339,7 +54990,7 @@
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52465,24 +57301,36 @@
+@@ -52462,24 +57433,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -54384,7 +55035,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52491,8 +57339,10 @@
+@@ -52488,8 +57471,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54396,7 +55047,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52518,24 +57368,36 @@
+@@ -52515,24 +57500,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -54441,7 +55092,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52544,13 +57406,15 @@
+@@ -52541,13 +57538,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54460,7 +55111,7 @@
if test "$ac_cv_sys_large_files" != no; then
cat >>confdefs.h <<_ACEOF
-@@ -52574,13 +57438,13 @@
+@@ -52571,13 +57570,13 @@
@@ -54478,7 +55129,7 @@
have_libsmbclient=no
if test "x$with_samba" != xno; then
-@@ -52589,8 +57453,7 @@
+@@ -52586,8 +57585,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -54488,7 +55139,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'
-@@ -52600,17 +57463,17 @@
+@@ -52597,17 +57595,17 @@
if test "${ac_cv_header_libsmbclient_h+set}" = set; then
@@ -54512,7 +55163,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52621,24 +57484,36 @@
+@@ -52618,24 +57616,36 @@
#include <libsmbclient.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -54557,7 +55208,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52647,15 +57522,16 @@
+@@ -52644,15 +57654,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54580,7 +55231,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -52664,8 +57540,13 @@
+@@ -52661,8 +57672,13 @@
/* end confdefs.h. */
#include <libsmbclient.h>
_ACEOF
@@ -54596,7 +55247,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -52689,9 +57570,10 @@
+@@ -52686,9 +57702,10 @@
ac_header_preproc=no
fi
@@ -54609,7 +55260,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -52715,25 +57597,18 @@
+@@ -52712,25 +57729,18 @@
echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;}
@@ -54640,7 +55291,7 @@
fi
if test $ac_cv_header_libsmbclient_h = yes; then
-@@ -52761,8 +57636,8 @@
+@@ -52758,8 +57768,8 @@
;;
esac
@@ -54651,7 +55302,7 @@
if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52775,40 +57650,52 @@
+@@ -52772,40 +57782,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -54716,7 +55367,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52817,14 +57704,15 @@
+@@ -52814,14 +57836,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54725,7 +55376,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
@@ -54736,7 +55387,7 @@
if test $ac_cv_lib_smbclient_smbc_new_context = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSMBCLIENT 1
-@@ -52841,8 +57729,8 @@
+@@ -52838,8 +57861,8 @@
SMBCLIENT_EXTRA_LIBS=""
@@ -54747,7 +55398,7 @@
if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52869,53 +57757,59 @@
+@@ -52866,53 +57889,59 @@
#undef yp_get_default_domain
@@ -54826,7 +55477,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -52924,13 +57818,14 @@
+@@ -52921,13 +57950,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54835,7 +55486,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_yp_get_default_domain" >&5
@@ -54845,7 +55496,7 @@
if test $ac_cv_func_yp_get_default_domain = yes; then
:
else
-@@ -52944,8 +57839,8 @@
+@@ -52941,8 +57971,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -54856,7 +55507,7 @@
if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -52958,40 +57853,52 @@
+@@ -52955,40 +57985,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -54921,7 +55572,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53000,14 +57907,15 @@
+@@ -52997,14 +58039,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -54930,7 +55581,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
@@ -54941,7 +55592,7 @@
if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
SMBCLIENT_EXTRA_LIBS="-lnsl"
fi
-@@ -53042,13 +57950,13 @@
+@@ -53039,13 +58082,13 @@
@@ -54959,7 +55610,7 @@
if test "x$with_openexr" != xno; then
-@@ -53061,8 +57969,8 @@
+@@ -53058,8 +58101,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
@@ -54970,7 +55621,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53077,56 +57985,56 @@
+@@ -53074,56 +58117,56 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -55043,7 +55694,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'
-@@ -53161,24 +58069,36 @@
+@@ -53158,24 +58201,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -55088,7 +55739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53187,10 +58107,11 @@
+@@ -53184,10 +58239,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55098,11 +55749,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"
CXXFLAGS="$kde_save_CXXFLAGS"
-@@ -53209,11 +58130,11 @@
+@@ -53206,11 +58262,11 @@
_ACEOF
LIB_EXR="$ac_cv_libexr"
@@ -55118,7 +55769,7 @@
LIB_EXR=""
fi
fi
-@@ -53245,8 +58166,7 @@
+@@ -53242,8 +58298,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -55128,7 +55779,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'
-@@ -53255,8 +58175,8 @@
+@@ -53252,8 +58307,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -55139,7 +55790,7 @@
if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53271,24 +58191,36 @@
+@@ -53268,24 +58323,36 @@
#include <X11/extensions/Xfixes.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -55184,7 +55835,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53297,12 +58229,13 @@
+@@ -53294,12 +58361,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55202,7 +55853,7 @@
if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
xfixes_h=yes
else
-@@ -53328,8 +58261,8 @@
+@@ -53325,8 +58393,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -55213,7 +55864,7 @@
if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53342,40 +58275,52 @@
+@@ -53339,40 +58407,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -55278,7 +55929,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53384,14 +58329,15 @@
+@@ -53381,14 +58461,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55287,7 +55938,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
@@ -55298,7 +55949,7 @@
if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
LIB_XFIXES=-lXfixes
-@@ -53419,15 +58365,14 @@
+@@ -53416,15 +58497,14 @@
kde_mallinfo_type=
@@ -55317,7 +55968,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'
-@@ -53460,24 +58405,36 @@
+@@ -53457,24 +58537,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -55362,7 +56013,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53486,9 +58443,10 @@
+@@ -53483,9 +58575,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55375,7 +56026,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53501,20 +58459,19 @@
+@@ -53498,20 +58591,19 @@
if test "$kde_cv_func_mallinfo_stdlib" = "yes"; then
kde_mallinfo_type=stdlib
fi
@@ -55401,7 +56052,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'
-@@ -53547,24 +58504,36 @@
+@@ -53544,24 +58636,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -55446,7 +56097,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53573,9 +58542,10 @@
+@@ -53570,9 +58674,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55459,7 +56110,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53588,8 +58558,8 @@
+@@ -53585,8 +58690,8 @@
if test "$kde_cv_func_mallinfo_malloc" = "yes"; then
kde_mallinfo_type=malloc
fi
@@ -55470,7 +56121,7 @@
fi
-@@ -53600,40 +58570,52 @@
+@@ -53597,40 +58702,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -55535,7 +56186,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53642,8 +58624,8 @@
+@@ -53639,8 +58756,8 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55546,7 +56197,7 @@
if test "${ac_cv_lib_malloc_mallinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -53656,40 +58638,52 @@
+@@ -53653,40 +58770,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -55611,7 +56262,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53698,14 +58692,15 @@
+@@ -53695,14 +58824,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -55620,7 +56271,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
@@ -55631,13 +56282,13 @@
if test $ac_cv_lib_malloc_mallinfo = yes; then
LIBMALLOC="-lmalloc"
-@@ -53715,20 +58710,20 @@
+@@ -53712,20 +58842,20 @@
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 -n "$kde_mallinfo_type"; then
@@ -55657,7 +56308,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'
-@@ -53812,13 +58807,22 @@
+@@ -53809,13 +58939,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -55684,7 +56335,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53831,8 +58835,10 @@
+@@ -53828,8 +58967,10 @@
( exit $ac_status )
kde_cv_func_mallinfo_field_hblkhd=no
fi
@@ -55696,7 +56347,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53842,8 +58848,8 @@
+@@ -53839,8 +58980,8 @@
fi
@@ -55707,7 +56358,7 @@
kde_mallinfo_hblkhd=$kde_cv_func_mallinfo_field_hblkhd
if test "$kde_mallinfo_hblkhd" = "yes"; then
-@@ -53854,15 +58860,14 @@
+@@ -53851,15 +58992,14 @@
fi
@@ -55726,7 +56377,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'
-@@ -53946,13 +58951,22 @@
+@@ -53943,13 +59083,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -55753,7 +56404,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -53965,8 +58979,10 @@
+@@ -53962,8 +59111,10 @@
( exit $ac_status )
kde_cv_func_mallinfo_field_uordblks=no
fi
@@ -55765,7 +56416,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -53976,8 +58992,8 @@
+@@ -53973,8 +59124,8 @@
fi
@@ -55776,7 +56427,7 @@
kde_mallinfo_uordblks=$kde_cv_func_mallinfo_field_uordblks
if test "$kde_mallinfo_uordblks" = "yes"; then
-@@ -53988,15 +59004,14 @@
+@@ -53985,15 +59136,14 @@
fi
@@ -55795,7 +56446,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'
-@@ -54080,13 +59095,22 @@
+@@ -54077,13 +59227,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -55822,7 +56473,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54099,8 +59123,10 @@
+@@ -54096,8 +59255,10 @@
( exit $ac_status )
kde_cv_func_mallinfo_field_usmblks=no
fi
@@ -55834,7 +56485,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -54110,8 +59136,8 @@
+@@ -54107,8 +59268,8 @@
fi
@@ -55845,7 +56496,7 @@
kde_mallinfo_usmblks=$kde_cv_func_mallinfo_field_usmblks
if test "$kde_mallinfo_usmblks" = "yes"; then
-@@ -54143,14 +59169,14 @@
+@@ -54140,14 +59301,14 @@
fi
@@ -55866,7 +56517,7 @@
if test "$ac_use_openpty" = "yes"; then
kde_safe_LIBS=$LIBS
LIBS="$LIBS $LIBUTIL"
-@@ -54181,13 +59207,22 @@
+@@ -54178,13 +59339,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -55893,7 +56544,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54200,8 +59235,10 @@
+@@ -54197,8 +59367,10 @@
( exit $ac_status )
ac_use_openpty="no"
fi
@@ -55905,7 +56556,7 @@
LIBS=$kde_safe_LIBS
fi
if test "$ac_use_openpty" = "yes"; then
-@@ -54210,21 +59247,21 @@
+@@ -54207,21 +59379,21 @@
#define HAVE_OPENPTY 1
_ACEOF
@@ -55935,7 +56586,7 @@
case "$cwd_method" in
proc)
-@@ -54240,9 +59277,9 @@
+@@ -54237,9 +59409,9 @@
for ac_func in _IceTransNoListen
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55948,7 +56599,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -54268,53 +59305,59 @@
+@@ -54265,53 +59437,59 @@
#undef $ac_func
@@ -56027,7 +56678,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54323,13 +59366,15 @@
+@@ -54320,13 +59498,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56036,7 +56687,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
@@ -56047,7 +56698,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -54343,11 +59388,11 @@
+@@ -54340,11 +59520,11 @@
LIB_XINERAMA=
@@ -56062,7 +56713,7 @@
if test "x$with_xinerama" != "xno"; then
xinerama_save_ldflags="$LDFLAGS"
-@@ -54357,8 +59402,7 @@
+@@ -54354,8 +59534,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -56072,7 +56723,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'
-@@ -54367,8 +59411,8 @@
+@@ -54364,8 +59543,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -56083,7 +56734,7 @@
if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -54385,24 +59429,36 @@
+@@ -54382,24 +59561,36 @@
#include <X11/extensions/Xinerama.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -56128,7 +56779,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54411,16 +59467,17 @@
+@@ -54408,16 +59599,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56152,7 +56803,7 @@
if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -54433,40 +59490,52 @@
+@@ -54430,40 +59622,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -56217,7 +56868,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54475,14 +59544,15 @@
+@@ -54472,14 +59676,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56226,7 +56877,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
@@ -56237,7 +56888,7 @@
if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
-@@ -54512,8 +59582,8 @@
+@@ -54509,8 +59714,8 @@
fi
@@ -56248,7 +56899,7 @@
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-@@ -54525,8 +59595,8 @@
+@@ -54522,8 +59727,8 @@
*) ksysguardd_compile=no; UNAME='' ;;
esac
@@ -56259,7 +56910,7 @@
-@@ -54611,23 +59681,22 @@
+@@ -54608,23 +59813,22 @@
@@ -56288,7 +56939,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'
-@@ -54640,18 +59709,19 @@
+@@ -54637,18 +59841,19 @@
for ac_header in sensors/sensors.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -56316,7 +56967,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54662,24 +59732,36 @@
+@@ -54659,24 +59864,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -56361,7 +57012,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54688,15 +59770,16 @@
+@@ -54685,15 +59902,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56384,7 +57035,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -54705,8 +59788,13 @@
+@@ -54702,8 +59920,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -56400,7 +57051,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -54730,9 +59818,10 @@
+@@ -54727,9 +59950,10 @@
ac_header_preproc=no
fi
@@ -56413,7 +57064,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -54756,25 +59845,19 @@
+@@ -54753,25 +59977,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;}
@@ -56446,7 +57097,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -54803,8 +59886,8 @@
+@@ -54800,8 +60018,8 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -56457,7 +57108,7 @@
if test "${ac_cv_lib_sensors_sensors_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -54817,40 +59900,52 @@
+@@ -54814,40 +60032,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -56522,7 +57173,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54859,14 +59954,15 @@
+@@ -54856,14 +60086,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56531,7 +57182,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
@@ -56542,7 +57193,7 @@
if test $ac_cv_lib_sensors_sensors_init = yes; then
LIBSENSORS="-lsensors"
fi
-@@ -54903,16 +59999,16 @@
+@@ -54900,16 +60131,16 @@
#MIN_CONFIG
@@ -56565,7 +57216,7 @@
save_dnssdtest_LIBS="$LIBS"
save_dnssdtest_LDFLAGS="$LDFLAGS"
save_dnssdtest_CPPFLAGS="$CPPFLAGS"
-@@ -54944,24 +60040,36 @@
+@@ -54941,24 +60172,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -56610,7 +57261,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -54976,20 +60084,21 @@
+@@ -54973,20 +60216,21 @@
*) LIB_DNSSD="-ldns_sd" ;;
esac
have_libdns_sd="yes"
@@ -56633,11 +57284,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_dnssdtest_CPPFLAGS
LDFLAGS=$save_dnssdtest_LDFLAGS
-@@ -55012,10 +60121,9 @@
+@@ -55009,10 +60253,9 @@
@@ -56649,7 +57300,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'
-@@ -55028,9 +60136,9 @@
+@@ -55025,9 +60268,9 @@
for ac_header in X11/extensions/Xdamage.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -56662,7 +57313,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55044,24 +60152,36 @@
+@@ -55041,24 +60284,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -56707,7 +57358,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55070,12 +60190,14 @@
+@@ -55067,12 +60322,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56726,7 +57377,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55099,10 +60221,9 @@
+@@ -55096,10 +60353,9 @@
@@ -56738,7 +57389,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'
-@@ -55115,9 +60236,9 @@
+@@ -55112,9 +60368,9 @@
for ac_header in X11/extensions/Xcomposite.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -56751,7 +57402,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55131,24 +60252,36 @@
+@@ -55128,24 +60384,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -56796,7 +57447,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55157,12 +60290,14 @@
+@@ -55154,12 +60422,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56815,7 +57466,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55186,10 +60321,9 @@
+@@ -55183,10 +60453,9 @@
@@ -56827,7 +57478,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'
-@@ -55202,9 +60336,9 @@
+@@ -55199,9 +60468,9 @@
for ac_header in X11/extensions/Xrender.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -56840,7 +57491,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -55218,24 +60352,36 @@
+@@ -55215,24 +60484,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -56885,7 +57536,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55244,12 +60390,14 @@
+@@ -55241,12 +60522,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -56904,7 +57555,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55288,8 +60436,7 @@
+@@ -55285,8 +60568,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -56914,7 +57565,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'
-@@ -55299,17 +60446,17 @@
+@@ -55296,17 +60578,17 @@
if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
@@ -56938,7 +57589,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -55320,24 +60467,36 @@
+@@ -55317,24 +60599,36 @@
#include <X11/Xlib.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -56983,7 +57634,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55346,15 +60505,16 @@
+@@ -55343,15 +60637,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57006,7 +57657,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -55363,8 +60523,13 @@
+@@ -55360,8 +60655,13 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
_ACEOF
@@ -57022,7 +57673,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -55388,9 +60553,10 @@
+@@ -55385,9 +60685,10 @@
ac_header_preproc=no
fi
@@ -57035,7 +57686,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -55414,25 +60580,18 @@
+@@ -55411,25 +60712,18 @@
echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
@@ -57066,7 +57717,7 @@
fi
-@@ -55449,8 +60608,7 @@
+@@ -55446,8 +60740,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -57076,7 +57727,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'
-@@ -55459,8 +60617,8 @@
+@@ -55456,8 +60749,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -57087,7 +57738,7 @@
if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -55477,24 +60635,36 @@
+@@ -55474,24 +60767,36 @@
#include <X11/extensions/XKBstr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -57132,7 +57783,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55503,12 +60673,13 @@
+@@ -55500,12 +60805,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57150,7 +57801,7 @@
if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
:
else
-@@ -55528,8 +60699,7 @@
+@@ -55525,8 +60831,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -57160,7 +57811,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'
-@@ -55538,8 +60708,8 @@
+@@ -55535,8 +60840,8 @@
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@@ -57171,7 +57822,7 @@
if test "${ac_cv_header_X11_extensions_XKBrules_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -55558,24 +60728,36 @@
+@@ -55555,24 +60860,36 @@
#include <X11/extensions/XKBrules.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -57216,7 +57867,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -55584,12 +60766,13 @@
+@@ -55581,12 +60898,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -57234,7 +57885,7 @@
if test $ac_cv_header_X11_extensions_XKBrules_h = yes; then
:
else
-@@ -55626,8 +60809,8 @@
+@@ -55623,8 +60941,8 @@
fi
for i in $ac_topsubdirs; do
@@ -57245,7 +57896,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -55638,8 +60821,8 @@
+@@ -55635,8 +60953,8 @@
else
install_it="no"
fi
@@ -57256,7 +57907,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -57095,39 +62278,58 @@
+@@ -57092,39 +62410,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -57331,7 +57982,7 @@
fi
fi
rm -f confcache
-@@ -57136,38 +62338,31 @@
+@@ -57133,38 +62470,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -57383,7 +58034,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
-@@ -57752,11 +62947,35 @@
+@@ -57749,11 +63079,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -57421,7 +58072,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -57765,8 +62984,43 @@
+@@ -57762,8 +63116,43 @@
fi
@@ -57466,7 +58117,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -57780,18 +63034,19 @@
+@@ -57777,18 +63166,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -57489,7 +58140,7 @@
as_basename=basename
else
as_basename=false
-@@ -57799,159 +63054,120 @@
+@@ -57796,159 +63186,120 @@
# Name of the executable.
@@ -57720,7 +58371,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -57960,7 +63176,19 @@
+@@ -57957,7 +63308,19 @@
as_mkdir_p=false
fi
@@ -57741,7 +58392,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'"
-@@ -57969,31 +63197,14 @@
+@@ -57966,31 +63329,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -57773,11 +58424,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
-@@ -58001,30 +63212,20 @@
+@@ -57998,30 +63344,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -57816,7 +58467,16 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -58051,19 +63252,21 @@
+@@ -58029,7 +63365,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
+@@ -58048,19 +63384,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -57828,7 +58488,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.
@@ -57844,7 +58504,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -58074,39 +63277,24 @@
+@@ -58071,39 +63409,24 @@
do
case $1 in
--*=*)
@@ -57890,7 +58550,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -58116,18 +63304,24 @@
+@@ -58113,18 +63436,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -57920,7 +58580,7 @@
esac
shift
-@@ -58143,529 +63337,541 @@
+@@ -58140,529 +63469,541 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -58965,7 +59625,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
-@@ -58677,739 +63883,1013 @@
+@@ -58674,739 +64015,1013 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -60657,7 +61317,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -59417,248 +64897,130 @@
+@@ -59414,248 +65029,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -61007,7 +61667,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -59669,135 +65031,39 @@
+@@ -59666,135 +65163,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -61169,7 +61829,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.
-@@ -59807,18 +65073,29 @@
+@@ -59804,18 +65205,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
@@ -61207,7 +61867,7 @@
else
continue
fi
-@@ -59840,53 +65117,79 @@
+@@ -59837,53 +65249,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -61320,7 +61980,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdebase, "3.5.5") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -61432,6 +62092,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -728,10 +737,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=desktop.docbook about.docbook winmng.docbook qt.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2
++KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook qt.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook install.docbook configkde.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.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
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
+- @for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
++ @for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
++ for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
++ for file in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/glossary/Makefile.in
+++ doc/glossary/Makefile.in
@@ -107,6 +107,7 @@
@@ -61537,6 +62234,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -731,7 +740,7 @@
+ KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdeprintingglossary.docbook checkxrefs index.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) checkxrefs index.docbook kdeprintingglossary.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
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
+- @for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
++ @for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
++ for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
++ for file in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kappfinder/Makefile.in
+++ doc/kappfinder/Makefile.in
@@ -107,6 +107,7 @@
@@ -61747,6 +62477,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -732,7 +741,7 @@
+ KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in man-kate.1.docbook unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png Makefile.am kate.png mimetypechooser.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -759,20 +768,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
+- @for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
++ @for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
++ for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
++ for file in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kcontrol/arts/Makefile.in
+++ doc/kcontrol/arts/Makefile.in
@@ -107,6 +107,7 @@
@@ -61852,6 +62615,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -731,7 +740,7 @@
+ KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook midi.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) midi.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
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
+- @for base in index.docbook midi.docbook ; do \
++ @for base in midi.docbook index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook midi.docbook ; do \
++ for base in midi.docbook index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook midi.docbook ; do \
++ for file in midi.docbook index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kcontrol/background/Makefile.in
+++ doc/kcontrol/background/Makefile.in
@@ -107,6 +107,7 @@
@@ -63217,6 +64013,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -731,7 +740,7 @@
+ KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kfileman1.png kfileman2.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kfileman1.png kfileman2.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
+- @for base in index.docbook kfileman1.png kfileman2.png ; do \
++ @for base in kfileman1.png kfileman2.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kfileman1.png kfileman2.png ; do \
++ for base in kfileman1.png kfileman2.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kfileman1.png kfileman2.png ; do \
++ for file in kfileman1.png kfileman2.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kcontrol/filetypes/Makefile.in
+++ doc/kcontrol/filetypes/Makefile.in
@@ -107,6 +107,7 @@
@@ -65002,6 +65831,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -731,7 +740,7 @@
+ KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook nsplugin.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) nsplugin.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
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
+- @for base in index.docbook nsplugin.docbook ; do \
++ @for base in nsplugin.docbook index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook nsplugin.docbook ; do \
++ for base in nsplugin.docbook index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook nsplugin.docbook ; do \
++ for file in nsplugin.docbook index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kcontrol/kwindecoration/Makefile.in
+++ doc/kcontrol/kwindecoration/Makefile.in
@@ -107,6 +107,7 @@
@@ -65296,6 +66158,15 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
+@@ -554,7 +563,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. background khtml helpindex proxy kcmtaskbar language passwords email fonts desktopbehavior cookies useragent kcmfontinst ebrowsing panel cache filetypes windowmanagement kcmlaunch arts desktop filemanager bell panelappearance crypto kwindecoration screensaver smb kcmcss mouse energy kcmstyle clock kcmaccess keyboard kcmsmserver colors performance kcmnotify netpref kcmkonsole keys kdm icons spellchecking
++SUBDIRS =. kdm smb spellchecking bell arts keys cookies filetypes desktop cache clock email fonts icons khtml filemanager mouse panel proxy desktopbehavior passwords panelappearance ebrowsing background kcmaccess colors crypto energy kcmstyle netpref kcmlaunch kcmcss kcmnotify kcmsmserver screensaver windowmanagement kwindecoration kcmkonsole language useragent helpindex keyboard kcmtaskbar kcmfontinst performance
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- all: all-recursive
@@ -562,7 +571,7 @@
all: docs-am all-recursive
@@ -65317,6 +66188,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -898,7 +907,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -925,20 +934,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol
+- @for base in index.docbook screenshot.png ; do \
++ @for base in screenshot.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook screenshot.png ; do \
++ for base in screenshot.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook screenshot.png ; do \
++ for file in screenshot.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kcontrol/mouse/Makefile.in
+++ doc/kcontrol/mouse/Makefile.in
@@ -107,6 +107,7 @@
@@ -66892,6 +67796,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -728,10 +737,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png kprinter_called_from_run_command.png index.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan.png ps-boxes.png cupsserverconfiguration4_directories.png final-word.docbook cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard1.png cups-config.docbook add-printer-wiz.docbook cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png cupsserverconfiguration8_networkgeneral.png rlpr.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png kcron_to_be_printed.png theory.docbook Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2
++KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png index.docbook kprinter_called_from_run_command.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png ps-boxes.png cupsaddprinterwizard3_networkscan.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfiguration7_miscellanious.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration5_HTTP.png cups-config.docbook cupsaddprinterwizard1.png cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png rlpr.docbook cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png theory.docbook kcron_to_be_printed.png Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
+- @for base in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
++ @for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
++ for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
++ for file in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kdesu/Makefile.in
+++ doc/kdesu/Makefile.in
@@ -107,6 +107,7 @@
@@ -67312,6 +68253,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -898,7 +907,7 @@
+ KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png index.cache.bz2 bgtable.png
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -925,20 +934,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
+- @for base in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
++ @for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
++ for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
++ for file in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kicker/Makefile.in
+++ doc/kicker/Makefile.in
@@ -107,6 +107,7 @@
@@ -67417,6 +68391,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -729,10 +738,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=k_menu_icon.png man-appletproxy.1.docbook screenshot_right.png bookmarks_icon.png man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
++KDE_DIST=k_menu_icon.png bookmarks_icon.png screenshot_right.png man-appletproxy.1.docbook man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -759,20 +768,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
+- @for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
++ @for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
++ for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
++ for file in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kinfocenter/cdinfo/Makefile.in
+++ doc/kinfocenter/cdinfo/Makefile.in
@@ -107,6 +107,7 @@
@@ -68026,6 +69037,15 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
+@@ -554,7 +563,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. processor interrupts devices samba protocols opengl sound usb pcmcia partitions nics xserver ioports scsi dma memory pci cdinfo
++SUBDIRS =. dma pci usb nics scsi interrupts devices xserver samba sound partitions cdinfo memory pcmcia opengl processor ioports protocols
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- all: all-recursive
@@ -562,7 +571,7 @@
all: docs-am all-recursive
@@ -69517,6 +70537,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -728,10 +737,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=finger.docbook smtp.docbook pop3s.docbook bzip2.docbook imap.docbook file.docbook bzip.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook sftp.docbook thumbnail.docbook pop3.docbook index.docbook floppy.docbook print.docbook telnet.docbook http.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in man.docbook rlogin.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2
++KDE_DIST=finger.docbook pop3s.docbook smtp.docbook bzip2.docbook imap.docbook bzip.docbook file.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook index.docbook pop3.docbook floppy.docbook print.docbook http.docbook telnet.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in rlogin.docbook man.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.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
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
+- @for base in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
++ @for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
++ for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
++ for file in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/klipper/Makefile.in
+++ doc/klipper/Makefile.in
@@ -107,6 +107,7 @@
@@ -69727,6 +70784,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -731,7 +740,7 @@
+ KDE_DIST=done.png new.png index.docbook selectinternet.png itemname.png Makefile.in kmenueditmain.png selecticon.png Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
+- @for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
++ @for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
++ for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
++ for file in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/knetattach/Makefile.in
+++ doc/knetattach/Makefile.in
@@ -107,6 +107,7 @@
@@ -70042,6 +71132,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -729,10 +738,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png man-kbookmarkmerger.1.docbook introduction.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am index.cache.bz2 filemanager.docbook
++KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png introduction.docbook man-kbookmarkmerger.1.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am filemanager.docbook index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.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
+@@ -759,20 +768,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
+- @for base in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
++ @for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
++ for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
++ for file in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/konsole/Makefile.in
+++ doc/konsole/Makefile.in
@@ -107,6 +107,7 @@
@@ -70147,6 +71274,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -731,7 +740,7 @@
+ KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook konsole.png tabbar.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konsole.png index.docbook tabbar.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
+- @for base in index.docbook konsole.png tabbar.png ; do \
++ @for base in konsole.png index.docbook tabbar.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook konsole.png tabbar.png ; do \
++ for base in konsole.png index.docbook tabbar.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook konsole.png tabbar.png ; do \
++ for file in konsole.png index.docbook tabbar.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kpager/Makefile.in
+++ doc/kpager/Makefile.in
@@ -107,6 +107,7 @@
@@ -70672,6 +71832,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -728,10 +737,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=index.docbook layout.png Makefile.in switching.png xkb.png Makefile.am index.cache.bz2
++KDE_DIST=index.docbook layout.png Makefile.in switching.png Makefile.am xkb.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook layout.png switching.png xkb.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) xkb.png layout.png index.docbook switching.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb
+- @for base in index.docbook layout.png switching.png xkb.png ; do \
++ @for base in xkb.png layout.png index.docbook switching.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook layout.png switching.png xkb.png ; do \
++ for base in xkb.png layout.png index.docbook switching.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook layout.png switching.png xkb.png ; do \
++ for file in xkb.png layout.png index.docbook switching.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/Makefile.in
+++ doc/Makefile.in
@@ -123,6 +123,7 @@
@@ -70756,7 +71953,14 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -562,7 +571,7 @@
+@@ -556,13 +565,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kdeprint kdebugdialog kappfinder kate kmenuedit konqueror knetattach quickstart kfind kcontrol userguide ksplashml kxkb kdcop glossary khelpcenter kwrite klipper kinfocenter faq visualdict kicker kpager konsole kdm kdesu kompmgr ksysguard kioslave
++SUBDIRS =. faq kdm kate kxkb ksysguard quickstart kdcop kdesu kfind klipper kappfinder kompmgr konsole khelpcenter kmenuedit kioslave knetattach glossary kcontrol kdeprint kicker kpager kwrite ksplashml kdebugdialog kinfocenter userguide konqueror visualdict
+ #>- all: all-recursive
+ #>+ 1
all: docs-am all-recursive
.SUFFIXES:
@@ -70987,6 +72191,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -728,10 +737,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook juk-icon.png amarok-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png oggfolder.png removable-disks.docbook getting-help.docbook noatun.png kmouth2.png knode-news-account.png font-installation.docbook extragear-applications.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png playing-movies.docbook file-sharing.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
++KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png knode-news-account.png kmouth2.png extragear-applications.docbook font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook kppp-dialer-tab.png printer-setup.docbook under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.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
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
+- @for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
++ @for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
++ for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
++ for file in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/visualdict/Makefile.in
+++ doc/visualdict/Makefile.in
@@ -107,6 +107,7 @@
@@ -71092,6 +72333,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -728,10 +737,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png contextmenu.png Makefile.am
++KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict13.png pict3.png contextmenu.png Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -758,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
+- @for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
++ @for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
++ for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
++ for file in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- drkonqi/debuggers/Makefile.in
+++ drkonqi/debuggers/Makefile.in
@@ -117,6 +117,7 @@
@@ -72667,6 +73945,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -932,7 +941,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop gtelnet.desktop xftp.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
++KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop gnometalk.desktop ickle.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop btdownloadgui.desktop Makefile.in BlueFish.desktop GnomeICU.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop
+
+ #>+ 2
+ docs-am:
--- kappfinder/apps/Internet/Terminal/Makefile.in
+++ kappfinder/apps/Internet/Terminal/Makefile.in
@@ -117,6 +117,7 @@
@@ -72982,6 +74269,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -782,7 +791,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=bcast2000.desktop XMovie.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am
++KDE_DIST=XMovie.desktop bcast2000.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am
+
+ #>+ 2
+ docs-am:
--- kappfinder/apps/Office/Makefile.in
+++ kappfinder/apps/Office/Makefile.in
@@ -117,6 +117,7 @@
@@ -73087,6 +74383,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -761,7 +770,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop pybliographic.desktop gnucash.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop lyx.desktop acroread.desktop Makefile.in mrproject.desktop scribus.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop
++KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop gnucash.desktop pybliographic.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop acroread.desktop lyx.desktop Makefile.in scribus.desktop mrproject.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop
+
+ #>+ 2
+ docs-am:
--- kappfinder/apps/System/Makefile.in
+++ kappfinder/apps/System/Makefile.in
@@ -133,6 +133,7 @@
@@ -73717,6 +75022,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1094,26 +1103,26 @@
+
+ #>+ 22
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+
+ #>+ 15
+ force-reedit:
--- kate/app/Makefile.in
+++ kate/app/Makefile.in
@@ -204,6 +204,7 @@
@@ -74032,6 +75373,119 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -901,6 +910,13 @@
+ .NOEXPORT:
+
+ #>+ 3
++plugin.moc: $(srcdir)/plugin.h
++ $(MOC) $(srcdir)/plugin.h -o plugin.moc
++
++#>+ 2
++mocs: plugin.moc
++
++#>+ 3
+ documentmanager.moc: $(srcdir)/documentmanager.h
+ $(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
+
+@@ -908,39 +924,39 @@
+ mocs: documentmanager.moc
+
+ #>+ 3
+-plugin.moc: $(srcdir)/plugin.h
+- $(MOC) $(srcdir)/plugin.h -o plugin.moc
++pluginconfiginterfaceextension.moc: $(srcdir)/pluginconfiginterfaceextension.h
++ $(MOC) $(srcdir)/pluginconfiginterfaceextension.h -o pluginconfiginterfaceextension.moc
+
+ #>+ 2
+-mocs: plugin.moc
++mocs: pluginconfiginterfaceextension.moc
+
+ #>+ 3
+-toolviewmanager.moc: $(srcdir)/toolviewmanager.h
+- $(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
++application.moc: $(srcdir)/application.h
++ $(MOC) $(srcdir)/application.h -o application.moc
+
+ #>+ 2
+-mocs: toolviewmanager.moc
++mocs: application.moc
+
+ #>+ 3
+-mainwindow.moc: $(srcdir)/mainwindow.h
+- $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
++pluginmanager.moc: $(srcdir)/pluginmanager.h
++ $(MOC) $(srcdir)/pluginmanager.h -o pluginmanager.moc
+
+ #>+ 2
+-mocs: mainwindow.moc
++mocs: pluginmanager.moc
+
+ #>+ 3
+-pluginconfiginterfaceextension.moc: $(srcdir)/pluginconfiginterfaceextension.h
+- $(MOC) $(srcdir)/pluginconfiginterfaceextension.h -o pluginconfiginterfaceextension.moc
++mainwindow.moc: $(srcdir)/mainwindow.h
++ $(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+
+ #>+ 2
+-mocs: pluginconfiginterfaceextension.moc
++mocs: mainwindow.moc
+
+ #>+ 3
+-application.moc: $(srcdir)/application.h
+- $(MOC) $(srcdir)/application.h -o application.moc
++toolviewmanager.moc: $(srcdir)/toolviewmanager.h
++ $(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
+
+ #>+ 2
+-mocs: application.moc
++mocs: toolviewmanager.moc
+
+ #>+ 3
+ viewmanager.moc: $(srcdir)/viewmanager.h
+@@ -950,15 +966,8 @@
+ mocs: viewmanager.moc
+
+ #>+ 3
+-pluginmanager.moc: $(srcdir)/pluginmanager.h
+- $(MOC) $(srcdir)/pluginmanager.h -o pluginmanager.moc
+-
+-#>+ 2
+-mocs: pluginmanager.moc
+-
+-#>+ 3
+ clean-metasources:
+- -rm -f documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
++ -rm -f plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am
+@@ -1005,7 +1014,7 @@
+
+
+ #>+ 11
+-libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp plugin.moc documentmanager.moc mainwindow.moc toolviewmanager.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
++libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
+ @echo 'creating libkateinterfacesprivate_la.all_cpp.cpp ...'; \
+ rm -f libkateinterfacesprivate_la.all_cpp.files libkateinterfacesprivate_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkateinterfacesprivate_la.all_cpp.final; \
+@@ -1043,15 +1052,15 @@
+ #>+ 19
+ documentmanager.o: documentmanager.moc
+ toolviewmanager.o: toolviewmanager.moc
+-pluginmanager.lo: pluginmanager.moc
+ mainwindow.lo: mainwindow.moc
++pluginmanager.lo: pluginmanager.moc
+ documentmanager.lo: documentmanager.moc
+ pluginmanager.o: pluginmanager.moc
+ viewmanager.lo: viewmanager.moc
+ toolviewmanager.lo: toolviewmanager.moc
+ viewmanager.o: viewmanager.moc
+-pluginconfiginterfaceextension.lo: pluginconfiginterfaceextension.moc
+ pluginconfiginterfaceextension.o: pluginconfiginterfaceextension.moc
++pluginconfiginterfaceextension.lo: pluginconfiginterfaceextension.moc
+ nmcheck:
+ plugin.lo: plugin.moc
+ plugin.o: plugin.moc
--- kate/Makefile.in
+++ kate/Makefile.in
@@ -125,6 +125,7 @@
@@ -74242,6 +75696,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -726,51 +735,51 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-curfiledir.png cr16-action-modmod.png Makefile.in cr16-action-modified.png lo16-action-modonhd.png lo22-action-indent.png cr16-action-highlighting.png Makefile.am
++KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-modmod.png cr16-action-curfiledir.png Makefile.in cr16-action-modified.png lo22-action-indent.png lo16-action-modonhd.png cr16-action-highlighting.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 40
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
+- $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+ $(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+- $(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
+- $(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
+ $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
++ $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
++ $(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
++ $(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
++ $(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
+ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
+- -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+ -rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
++ -rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+
+ #>+ 15
+ force-reedit:
--- kate/pics/Makefile.in
+++ kate/pics/Makefile.in
@@ -133,6 +133,7 @@
@@ -74347,6 +75879,75 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -930,43 +939,43 @@
+
+ #>+ 39
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
+
+ #>+ 15
+ force-reedit:
--- kate/utils/Makefile.in
+++ kate/utils/Makefile.in
@@ -157,6 +157,7 @@
@@ -75082,6 +76683,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1101,18 +1110,18 @@
+
+
+ #>+ 3
+-bgrender.moc: $(srcdir)/bgrender.h
+- $(MOC) $(srcdir)/bgrender.h -o bgrender.moc
++bgwallpaper.moc: $(srcdir)/bgwallpaper.h
++ $(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
+
+ #>+ 2
+-mocs: bgrender.moc
++mocs: bgwallpaper.moc
+
+ #>+ 3
+-bgwallpaper.moc: $(srcdir)/bgwallpaper.h
+- $(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
++bgrender.moc: $(srcdir)/bgrender.h
++ $(MOC) $(srcdir)/bgrender.h -o bgrender.moc
+
+ #>+ 2
+-mocs: bgwallpaper.moc
++mocs: bgrender.moc
+
+ #>+ 3
+ bgadvanced.moc: $(srcdir)/bgadvanced.h
+@@ -1144,7 +1153,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f bgrender.moc bgwallpaper.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
++ -rm -f bgwallpaper.moc bgrender.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
+
+ #>+ 2
+ KDE_DIST=background.desktop bgwallpaper_ui.ui bghash.h bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
+@@ -1263,8 +1272,8 @@
+ $(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h
+ bgdialog.lo: bgdialog.moc
+ nmcheck:
+-bgrender.lo: bgrender.moc
+ bgwallpaper.o: bgwallpaper.moc
++bgrender.lo: bgrender.moc
+ nmcheck-am: nmcheck
+ bgrender.o: bgrender.moc
+
--- kcontrol/background/pics/Makefile.in
+++ kcontrol/background/pics/Makefile.in
@@ -117,6 +117,7 @@
@@ -75397,6 +77042,56 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -928,18 +937,18 @@
+
+
+ #>+ 3
+-dtime.moc: $(srcdir)/dtime.h
+- $(MOC) $(srcdir)/dtime.h -o dtime.moc
++tzone.moc: $(srcdir)/tzone.h
++ $(MOC) $(srcdir)/tzone.h -o tzone.moc
+
+ #>+ 2
+-mocs: dtime.moc
++mocs: tzone.moc
+
+ #>+ 3
+-tzone.moc: $(srcdir)/tzone.h
+- $(MOC) $(srcdir)/tzone.h -o tzone.moc
++dtime.moc: $(srcdir)/dtime.h
++ $(MOC) $(srcdir)/dtime.h -o dtime.moc
+
+ #>+ 2
+-mocs: tzone.moc
++mocs: dtime.moc
+
+ #>+ 3
+ main.moc: $(srcdir)/main.h
+@@ -950,7 +959,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f dtime.moc tzone.moc main.moc
++ -rm -f tzone.moc dtime.moc main.moc
+
+ #>+ 2
+ KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am
+@@ -1001,7 +1010,7 @@
+
+
+ #>+ 11
+-kcm_clock_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dtime.cpp $(srcdir)/tzone.cpp $(srcdir)/main.cpp tzone.moc dtime.moc main.moc
++kcm_clock_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dtime.cpp $(srcdir)/tzone.cpp $(srcdir)/main.cpp dtime.moc tzone.moc main.moc
+ @echo 'creating kcm_clock_la.all_cpp.cpp ...'; \
+ rm -f kcm_clock_la.all_cpp.files kcm_clock_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_clock_la.all_cpp.final; \
+@@ -1043,5 +1052,5 @@
+ nmcheck-am: nmcheck
+ dtime.lo: dtime.moc
+ main.o: main.moc
+-dtime.o: dtime.moc
+ tzone.o: tzone.moc
++dtime.o: dtime.moc
--- kcontrol/colors/Makefile.in
+++ kcontrol/colors/Makefile.in
@@ -157,6 +157,7 @@
@@ -75712,6 +77407,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1069,7 +1078,7 @@
+ -rm -f componentchooser.moc kcm_componentchooser.moc
+
+ #>+ 2
+-KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui Makefile.in componentchooser.desktop Makefile.am componentchooser.h
++KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui componentchooser.desktop Makefile.in Makefile.am componentchooser.h
+
+ #>+ 8
+ clean-ui:
--- kcontrol/crypto/Makefile.in
+++ kcontrol/crypto/Makefile.in
@@ -157,6 +157,7 @@
@@ -75817,6 +77521,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -934,18 +943,18 @@
+
+
+ #>+ 3
+-crypto.moc: $(srcdir)/crypto.h
+- $(MOC) $(srcdir)/crypto.h -o crypto.moc
++kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
++ $(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
+
+ #>+ 2
+-mocs: crypto.moc
++mocs: kdatetimedlg.moc
+
+ #>+ 3
+-kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
+- $(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
++crypto.moc: $(srcdir)/crypto.h
++ $(MOC) $(srcdir)/crypto.h -o crypto.moc
+
+ #>+ 2
+-mocs: kdatetimedlg.moc
++mocs: crypto.moc
+
+ #>+ 3
+ certexport.moc: $(srcdir)/certexport.h
+@@ -956,7 +965,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f crypto.moc kdatetimedlg.moc certexport.moc
++ -rm -f kdatetimedlg.moc crypto.moc certexport.moc
+
+ #>+ 2
+ KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am
+@@ -1007,7 +1016,7 @@
+
+
+ #>+ 11
+-kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp kdatetimedlg.moc crypto.moc certexport.moc
++kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp crypto.moc kdatetimedlg.moc certexport.moc
+ @echo 'creating kcm_crypto_la.all_cpp.cpp ...'; \
+ rm -f kcm_crypto_la.all_cpp.files kcm_crypto_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
--- kcontrol/css/Makefile.in
+++ kcontrol/css/Makefile.in
@@ -154,6 +154,7 @@
@@ -76447,6 +78194,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -843,7 +852,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=kde.desktop leo.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop qt3.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop en2fr.desktop acronym.desktop google.desktop fsd.desktop nl-teletekst.desktop webster.desktop katatudo.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop cia.desktop alltheweb.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop feedster.desktop foldoc.desktop en2de.desktop google_news.desktop dbug.desktop wiktionary.desktop qt.desktop kde_websvn.desktop technorati.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop metacrawler.desktop excite.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
++KDE_DIST=leo.desktop kde.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop qt3.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop google.desktop acronym.desktop en2fr.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop nl-telephone.desktop php.desktop foldoc.desktop feedster.desktop en2de.desktop dbug.desktop wiktionary.desktop google_news.desktop qt.desktop kde_websvn.desktop rfc.desktop technorati.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop excite.desktop metacrawler.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop
+
+ #>+ 2
+ docs-am:
--- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
@@ -176,6 +176,7 @@
@@ -77287,6 +79043,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -960,18 +969,18 @@
+
+
+ #>+ 3
+-iconthemes.moc: $(srcdir)/iconthemes.h
+- $(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
++icons.moc: $(srcdir)/icons.h
++ $(MOC) $(srcdir)/icons.h -o icons.moc
+
+ #>+ 2
+-mocs: iconthemes.moc
++mocs: icons.moc
+
+ #>+ 3
+-icons.moc: $(srcdir)/icons.h
+- $(MOC) $(srcdir)/icons.h -o icons.moc
++iconthemes.moc: $(srcdir)/iconthemes.h
++ $(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
+
+ #>+ 2
+-mocs: icons.moc
++mocs: iconthemes.moc
+
+ #>+ 3
+ main.moc: $(srcdir)/main.h
+@@ -982,7 +991,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f iconthemes.moc icons.moc main.moc
++ -rm -f icons.moc iconthemes.moc main.moc
+
+ #>+ 2
+ KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am
+@@ -1033,7 +1042,7 @@
+
+
+ #>+ 11
+-kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp icons.moc iconthemes.moc main.moc
++kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp iconthemes.moc icons.moc main.moc
+ @echo 'creating kcm_icons_la.all_cpp.cpp ...'; \
+ rm -f kcm_icons_la.all_cpp.files kcm_icons_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
--- kcontrol/info/Makefile.in
+++ kcontrol/info/Makefile.in
@@ -157,6 +157,7 @@
@@ -77392,6 +79191,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -948,7 +957,7 @@
+ -rm -f memory.moc
+
+ #>+ 2
+-KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp ioports.desktop memory_solaris.cpp info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_fbsd.cpp info_hpux.cpp info.h memory_tru64.cpp devices.desktop memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop cdinfo.desktop Makefile.am memory.h
++KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp memory_solaris.cpp ioports.desktop info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_hpux.cpp info_fbsd.cpp info.h devices.desktop memory_tru64.cpp memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop cdinfo.desktop Makefile.am memory.h
+
+ #>+ 3
+ clean-closures:
--- kcontrol/input/core/Makefile.in
+++ kcontrol/input/core/Makefile.in
@@ -140,6 +140,7 @@
@@ -77602,6 +79410,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1178,7 +1187,7 @@
+ -rm -f logitechmouse.moc mouse.moc
+
+ #>+ 2
+-KDE_DIST=consoleUserPerms mouse.desktop configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am
++KDE_DIST=mouse.desktop consoleUserPerms configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am
+
+ #>+ 5
+ clean-ui:
--- kcontrol/input/pics/Makefile.in
+++ kcontrol/input/pics/Makefile.in
@@ -117,6 +117,7 @@
@@ -78232,6 +80049,89 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1256,6 +1265,13 @@
+ mocs: indexwidget.moc
+
+ #>+ 3
++moduleiconview.moc: $(srcdir)/moduleiconview.h
++ $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
++
++#>+ 2
++mocs: moduleiconview.moc
++
++#>+ 3
+ dockcontainer.moc: $(srcdir)/dockcontainer.h
+ $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
+
+@@ -1270,13 +1286,6 @@
+ mocs: aboutwidget.moc
+
+ #>+ 3
+-moduleiconview.moc: $(srcdir)/moduleiconview.h
+- $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
+-
+-#>+ 2
+-mocs: moduleiconview.moc
+-
+-#>+ 3
+ proxywidget.moc: $(srcdir)/proxywidget.h
+ $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
+
+@@ -1334,10 +1343,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
++ -rm -f indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
+
+ #>+ 2
+-KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h cr64-app-kcontrol.png global.h modulemenu.cpp modulemenu.h kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h
++KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h cr64-app-kcontrol.png global.h modulemenu.h modulemenu.cpp kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h
+
+ #>+ 4
+ clean-idl:
+@@ -1349,23 +1358,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+
+ #>+ 15
+ force-reedit:
+@@ -1406,7 +1415,7 @@
+
+
+ #>+ 11
+-libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
++libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp indexwidget.moc aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
+ @echo 'creating libkdeinit_kcontrol_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_kcontrol_la.all_cpp.files libkdeinit_kcontrol_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
--- kcontrol/kded/Makefile.in
+++ kcontrol/kded/Makefile.in
@@ -150,6 +150,7 @@
@@ -78337,6 +80237,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -934,7 +943,7 @@
+ -rm -f kcmkded.moc
+
+ #>+ 2
+-KDE_DIST=kcmkded.desktop Makefile.in kcmkded.h Makefile.am
++KDE_DIST=kcmkded.desktop kcmkded.h Makefile.in Makefile.am
+
+ #>+ 3
+ clean-closures:
--- kcontrol/kdm/Makefile.in
+++ kcontrol/kdm/Makefile.in
@@ -161,6 +161,7 @@
@@ -78547,6 +80456,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1017,18 +1026,18 @@
+ mocs: treeview.moc
+
+ #>+ 3
+-modifiers.moc: $(srcdir)/modifiers.h
+- $(MOC) $(srcdir)/modifiers.h -o modifiers.moc
++shortcuts.moc: $(srcdir)/shortcuts.h
++ $(MOC) $(srcdir)/shortcuts.h -o shortcuts.moc
+
+ #>+ 2
+-mocs: modifiers.moc
++mocs: shortcuts.moc
+
+ #>+ 3
+-shortcuts.moc: $(srcdir)/shortcuts.h
+- $(MOC) $(srcdir)/shortcuts.h -o shortcuts.moc
++modifiers.moc: $(srcdir)/modifiers.h
++ $(MOC) $(srcdir)/modifiers.h -o modifiers.moc
+
+ #>+ 2
+-mocs: shortcuts.moc
++mocs: modifiers.moc
+
+ #>+ 3
+ keyconfig.moc: $(srcdir)/keyconfig.h
+@@ -1046,7 +1055,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f commandShortcuts.moc treeview.moc modifiers.moc shortcuts.moc keyconfig.moc main.moc
++ -rm -f commandShortcuts.moc treeview.moc shortcuts.moc modifiers.moc keyconfig.moc main.moc
+
+ #>+ 2
+ KDE_DIST=keys.desktop commandShortcuts.h kaccelaction.h treeview.h win3.kksrc main.h kde4.kksrc shortcuts.h win4.kksrc mac4.kksrc khotkeys.h modifiers.h keyconfig.h keyconfig.cpp wm3.kksrc convertShortcuts.pl unix3.kksrc Makefile.in kde3.kksrc kaccel.upd Makefile.am
+@@ -1097,7 +1106,7 @@
+
+
+ #>+ 11
+-kcm_keys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/shortcuts.cpp $(srcdir)/modifiers.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp $(srcdir)/treeview.cpp $(srcdir)/commandShortcuts.cpp commandShortcuts.moc treeview.moc shortcuts.moc modifiers.moc main.moc
++kcm_keys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/shortcuts.cpp $(srcdir)/modifiers.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp $(srcdir)/treeview.cpp $(srcdir)/commandShortcuts.cpp commandShortcuts.moc treeview.moc modifiers.moc shortcuts.moc main.moc
+ @echo 'creating kcm_keys_la.all_cpp.cpp ...'; \
+ rm -f kcm_keys_la.all_cpp.files kcm_keys_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_keys_la.all_cpp.final; \
--- kcontrol/kfontinst/kcmfontinst/Makefile.in
+++ kcontrol/kfontinst/kcmfontinst/Makefile.in
@@ -162,6 +162,7 @@
@@ -78652,6 +80604,26 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -986,16 +995,16 @@
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
+
+ #>+ 15
--- kcontrol/kfontinst/kfile-plugin/Makefile.in
+++ kcontrol/kfontinst/kfile-plugin/Makefile.in
@@ -154,6 +154,7 @@
@@ -79387,6 +81359,66 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1035,11 +1044,11 @@
+ .NOEXPORT:
+
+ #>+ 3
+-FontViewPart.moc: $(srcdir)/FontViewPart.h
+- $(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
++FontViewerApp.moc: $(srcdir)/FontViewerApp.h
++ $(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
+
+ #>+ 2
+-mocs: FontViewPart.moc
++mocs: FontViewerApp.moc
+
+ #>+ 3
+ FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
+@@ -1049,11 +1058,11 @@
+ mocs: FontViewPartFactory.moc
+
+ #>+ 3
+-FontViewerApp.moc: $(srcdir)/FontViewerApp.h
+- $(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
++FontViewPart.moc: $(srcdir)/FontViewPart.h
++ $(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
+
+ #>+ 2
+-mocs: FontViewerApp.moc
++mocs: FontViewPart.moc
+
+ #>+ 3
+ FontPreview.moc: $(srcdir)/FontPreview.h
+@@ -1073,7 +1082,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f FontViewPart.moc FontViewPartFactory.moc FontViewerApp.moc FontPreview.moc
++ -rm -f FontViewerApp.moc FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
+
+ #>+ 2
+ KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc
+@@ -1124,7 +1133,7 @@
+
+
+ #>+ 11
+-libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
++libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp FontViewPart.moc FontViewPartFactory.moc FontPreview.moc
+ @echo 'creating libkfontviewpart_la.all_cpp.cpp ...'; \
+ rm -f libkfontviewpart_la.all_cpp.files libkfontviewpart_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkfontviewpart_la.all_cpp.final; \
+@@ -1164,9 +1173,9 @@
+ FontPreview.lo: FontPreview.moc
+ FontPreview.o: FontPreview.moc
+ nmcheck-am: nmcheck
+-FontViewPart.o: FontViewPart.moc
+ FontViewPartFactory.lo: FontViewPartFactory.moc
++FontViewPart.o: FontViewPart.moc
+ FontViewPart.lo: FontViewPart.moc
+-FontViewPartFactory.o: FontViewPartFactory.moc
+ FontViewerApp.lo: FontViewerApp.moc
++FontViewPartFactory.o: FontViewPartFactory.moc
+ FontViewerApp.o: FontViewerApp.moc
--- kcontrol/kicker/Makefile.in
+++ kcontrol/kicker/Makefile.in
@@ -166,6 +166,7 @@
@@ -79492,6 +81524,68 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1009,11 +1018,11 @@
+
+
+ #>+ 3
+-lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
+- $(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
++applettab_impl.moc: $(srcdir)/applettab_impl.h
++ $(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
+
+ #>+ 2
+-mocs: lookandfeelconfig.moc
++mocs: applettab_impl.moc
+
+ #>+ 3
+ menutab_impl.moc: $(srcdir)/menutab_impl.h
+@@ -1023,11 +1032,11 @@
+ mocs: menutab_impl.moc
+
+ #>+ 3
+-applettab_impl.moc: $(srcdir)/applettab_impl.h
+- $(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
++lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
++ $(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
+
+ #>+ 2
+-mocs: applettab_impl.moc
++mocs: lookandfeelconfig.moc
+
+ #>+ 3
+ positionconfig.moc: $(srcdir)/positionconfig.h
+@@ -1094,10 +1103,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f lookandfeelconfig.moc menutab_impl.moc applettab_impl.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
++ -rm -f applettab_impl.moc menutab_impl.moc lookandfeelconfig.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
+
+ #>+ 2
+-KDE_DIST=applettab_impl.h lookandfeelconfig.h lookandfeeltab.ui lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am
++KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeelconfig.h lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am
+
+ #>+ 4
+ clean-idl:
+@@ -1159,7 +1168,7 @@
+
+
+ #>+ 11
+-kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp menutab_impl.moc lookandfeelconfig.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
++kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp lookandfeelconfig.moc menutab_impl.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
+ @echo 'creating kcm_kicker_la.all_cpp.cpp ...'; \
+ rm -f kcm_kicker_la.all_cpp.files kcm_kicker_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_kicker_la.all_cpp.final; \
+@@ -1216,8 +1225,8 @@
+ $(srcdir)/positiontab_impl.cpp: positiontab.h hidingtab.h lookandfeeltab.h menutab.h advancedOptions.h
+ lookandfeeltab_kcm.o: lookandfeeltab_kcm.moc
+ positionconfig.lo: positionconfig.moc
+-lookandfeelconfig.lo: lookandfeelconfig.moc
+ applettab_impl.lo: applettab_impl.moc
++lookandfeelconfig.lo: lookandfeelconfig.moc
+ main.o: main.moc
+ lookandfeelconfig.o: lookandfeelconfig.moc
+ menutab_impl.lo: menutab_impl.moc
--- kcontrol/kio/Makefile.in
+++ kcontrol/kio/Makefile.in
@@ -182,6 +182,7 @@
@@ -79597,6 +81691,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1177,18 +1186,18 @@
+ mocs: smbrodlg.moc
+
+ #>+ 3
+-socks.moc: $(srcdir)/socks.h
+- $(MOC) $(srcdir)/socks.h -o socks.moc
++kmanualproxydlg.moc: $(srcdir)/kmanualproxydlg.h
++ $(MOC) $(srcdir)/kmanualproxydlg.h -o kmanualproxydlg.moc
+
+ #>+ 2
+-mocs: socks.moc
++mocs: kmanualproxydlg.moc
+
+ #>+ 3
+-kmanualproxydlg.moc: $(srcdir)/kmanualproxydlg.h
+- $(MOC) $(srcdir)/kmanualproxydlg.h -o kmanualproxydlg.moc
++socks.moc: $(srcdir)/socks.h
++ $(MOC) $(srcdir)/socks.h -o socks.moc
+
+ #>+ 2
+-mocs: kmanualproxydlg.moc
++mocs: socks.moc
+
+ #>+ 3
+ kproxydlg.moc: $(srcdir)/kproxydlg.h
+@@ -1262,10 +1271,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f uagentproviderdlg.moc smbrodlg.moc socks.moc kmanualproxydlg.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
++ -rm -f uagentproviderdlg.moc smbrodlg.moc kmanualproxydlg.moc socks.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
+
+ #>+ 2
+-KDE_DIST=uasprovider.desktop policydlg.h fakeuaprovider.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO useragentdlg.h kio_ftprc.kcfg kioslave.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui cache_ui.ui useragentdlg_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui
++KDE_DIST=uasprovider.desktop fakeuaprovider.h policydlg.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO kioslave.kcfg useragentdlg.h kio_ftprc.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui useragentdlg_ui.ui cache_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui
+
+ #>+ 13
+ clean-ui:
+@@ -1327,7 +1336,7 @@
+
+
+ #>+ 11
+-kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc socks.moc kmanualproxydlg.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
++kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc kmanualproxydlg.moc socks.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
+ @echo 'creating kcm_kio_la.all_cpp.cpp ...'; \
+ rm -f kcm_kio_la.all_cpp.files kcm_kio_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
--- kcontrol/kio/uasproviders/Makefile.in
+++ kcontrol/kio/uasproviders/Makefile.in
@@ -117,6 +117,7 @@
@@ -79702,6 +81843,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -764,7 +773,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari12.desktop ie45onwinnt5.desktop wgetoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop safari20.desktop ie501onwinnt5.desktop firefox10oncurrent.desktop ns71onwinnt51.desktop ie60oncurrent.desktop ie55onwinnt5.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop firefox15oncurrent.desktop Makefile.am mozoncurrent12.desktop
++KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari12.desktop ie45onwinnt5.desktop wgetoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop safari20.desktop firefox10oncurrent.desktop ns71onwinnt51.desktop ie55onwinnt5.desktop ie60oncurrent.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop firefox15oncurrent.desktop mozoncurrent12.desktop Makefile.am
+
+ #>+ 2
+ docs-am:
--- kcontrol/knotify/Makefile.in
+++ kcontrol/knotify/Makefile.in
@@ -171,6 +171,7 @@
@@ -80017,6 +82167,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1055,7 +1064,7 @@
+ -rm -f previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
+
+ #>+ 2
+-KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h filepreviews.desktop desktop.h previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop Makefile.am desktop.desktop
++KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h desktop.h filepreviews.desktop previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop desktop.desktop Makefile.am
+
+ #>+ 4
+ clean-idl:
--- kcontrol/konqhtml/Makefile.in
+++ kcontrol/konqhtml/Makefile.in
@@ -158,6 +158,7 @@
@@ -80122,6 +82281,73 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -985,13 +994,6 @@
+ mocs: jspolicies.moc
+
+ #>+ 3
+-appearance.moc: $(srcdir)/appearance.h
+- $(MOC) $(srcdir)/appearance.h -o appearance.moc
+-
+-#>+ 2
+-mocs: appearance.moc
+-
+-#>+ 3
+ main.moc: $(srcdir)/main.h
+ $(MOC) $(srcdir)/main.h -o main.moc
+
+@@ -1006,6 +1008,13 @@
+ mocs: jsopts.moc
+
+ #>+ 3
++appearance.moc: $(srcdir)/appearance.h
++ $(MOC) $(srcdir)/appearance.h -o appearance.moc
++
++#>+ 2
++mocs: appearance.moc
++
++#>+ 3
+ javaopts.moc: $(srcdir)/javaopts.h
+ $(MOC) $(srcdir)/javaopts.h -o javaopts.moc
+
+@@ -1034,22 +1043,22 @@
+ mocs: advancedTabDialog.moc
+
+ #>+ 3
+-pluginopts.moc: $(srcdir)/pluginopts.h
+- $(MOC) $(srcdir)/pluginopts.h -o pluginopts.moc
++htmlopts.moc: $(srcdir)/htmlopts.h
++ $(MOC) $(srcdir)/htmlopts.h -o htmlopts.moc
+
+ #>+ 2
+-mocs: pluginopts.moc
++mocs: htmlopts.moc
+
+ #>+ 3
+-htmlopts.moc: $(srcdir)/htmlopts.h
+- $(MOC) $(srcdir)/htmlopts.h -o htmlopts.moc
++pluginopts.moc: $(srcdir)/pluginopts.h
++ $(MOC) $(srcdir)/pluginopts.h -o pluginopts.moc
+
+ #>+ 2
+-mocs: htmlopts.moc
++mocs: pluginopts.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f khttpoptdlg.moc filteropts.moc jspolicies.moc appearance.moc main.moc jsopts.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
++ -rm -f khttpoptdlg.moc filteropts.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
+
+ #>+ 2
+ KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am
+@@ -1106,7 +1115,7 @@
+
+
+ #>+ 11
+-kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc filteropts.moc jsopts.moc main.moc appearance.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
++kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp khttpoptdlg.moc jspolicies.moc filteropts.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
+ @echo 'creating kcm_konqhtml_la.all_cpp.cpp ...'; \
+ rm -f kcm_konqhtml_la.all_cpp.files kcm_konqhtml_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
--- kcontrol/konsole/Makefile.in
+++ kcontrol/konsole/Makefile.in
@@ -158,6 +158,7 @@
@@ -80332,6 +82558,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
+@@ -784,7 +793,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad Makefile.in XOsview.ad WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am
++KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad XOsview.ad Makefile.in WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am
+
+ #>+ 2
+ docs-am:
--- kcontrol/krdb/kcs/Makefile.in
+++ kcontrol/krdb/kcs/Makefile.in
@@ -117,6 +117,7 @@
@@ -80437,6 +82672,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -763,7 +772,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc Pumpkin.kcsrc MediaPeach.kcsrc DarkBlue.kcsrc KDEOne.kcsrc DesertRed.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc Windows95.kcsrc CDE.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am
++KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc MediaPeach.kcsrc Pumpkin.kcsrc DarkBlue.kcsrc DesertRed.kcsrc KDEOne.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc CDE.kcsrc Windows95.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am
+
+ #>+ 2
+ docs-am:
--- kcontrol/krdb/Makefile.in
+++ kcontrol/krdb/Makefile.in
@@ -162,6 +162,7 @@
@@ -82432,6 +84676,54 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1088,11 +1097,11 @@
+ mocs: klocalesample.moc
+
+ #>+ 3
+-localeother.moc: $(srcdir)/localeother.h
+- $(MOC) $(srcdir)/localeother.h -o localeother.moc
++toplevel.moc: $(srcdir)/toplevel.h
++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+
+ #>+ 2
+-mocs: localeother.moc
++mocs: toplevel.moc
+
+ #>+ 3
+ localemon.moc: $(srcdir)/localemon.h
+@@ -1102,11 +1111,11 @@
+ mocs: localemon.moc
+
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++localeother.moc: $(srcdir)/localeother.h
++ $(MOC) $(srcdir)/localeother.h -o localeother.moc
+
+ #>+ 2
+-mocs: toplevel.moc
++mocs: localeother.moc
+
+ #>+ 3
+ kcmlocale.moc: $(srcdir)/kcmlocale.h
+@@ -1124,7 +1133,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
++ -rm -f localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
+
+ #>+ 2
+ KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am
+@@ -1175,7 +1184,7 @@
+
+
+ #>+ 11
+-kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
++kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
+ @echo 'creating kcm_locale_la.all_cpp.cpp ...'; \
+ rm -f kcm_locale_la.all_cpp.files kcm_locale_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
--- kcontrol/locale/pics/Makefile.in
+++ kcontrol/locale/pics/Makefile.in
@@ -117,6 +117,7 @@
@@ -82957,6 +85249,1093 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -725,581 +734,581 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png cr48-app-input_devices_settings.png crsc-app-samba.svgz cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr48-app-date.png cr48-app-bell.png cr32-app-style.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr128-app-fonts.png cr16-app-iconthemes.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr48-app-colors.png cr64-app-kcmpci.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr32-app-keyboard_layout.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr48-app-usb.png cr32-app-enhanced_browsing.png cr128-app-energy.png cr128-app-kdmconfig.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr32-app-kcmkwm.png cr48-app-access.png cr22-app-bell.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr48-app-kthememgr.png cr128-app-bell.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr64-app-energy_star.png cr16-app-hwinfo.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-device-laptop.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png cr22-app-personal.png cr48-app-kscreensaver.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png crsc-app-ieee1394.svgz cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr64-app-bell.png cr128-app-date.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr48-app-samba.png cr64-app-kcmdf.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr48-app-background.png cr128-app-personal.png cr48-app-knotify.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr22-device-laptop.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr22-app-fonts.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am
++KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr64-app-locale.png cr48-app-kcmx.png cr22-app-arts.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr22-app-hwinfo.png cr48-app-multimedia.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr48-app-key_bindings.png cr64-app-hwinfo.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr64-app-kcmpci.png cr48-app-colors.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr32-app-date.png cr128-app-proxy.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-keyboard_layout.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr32-app-kscreensaver.png cr22-app-kcmkwm.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr128-app-kcmmemory.png cr22-app-date.png cr16-app-bell.png cr32-app-arts.png cr48-app-kcmsystem.png cr48-app-agent.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr48-device-laptop.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr16-app-personal.png cr128-app-kcmdevices.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png crsc-app-ieee1394.svgz cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr22-app-access.png cr48-app-samba.png cr64-app-kcmdf.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr128-app-personal.png cr48-app-knotify.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png cr22-device-laptop.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 570
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
++ $(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
+- $(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+- $(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
+- $(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
+- $(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
+ $(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
+- $(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
+- $(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
++ $(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
++ $(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
+- $(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
+ $(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
+- $(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
++ $(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
++ $(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
++ $(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
+
+ #>+ 15
+ force-reedit:
--- kcontrol/privacy/Makefile.in
+++ kcontrol/privacy/Makefile.in
@@ -156,6 +156,7 @@
@@ -84847,6 +88226,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -759,7 +768,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Bug.png Rabbit.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am
++KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Rabbit.png Bug.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am
+
+ #>+ 2
+ docs-am:
--- kdepasswd/Makefile.in
+++ kdepasswd/Makefile.in
@@ -172,6 +172,7 @@
@@ -85162,6 +88550,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1030,38 +1039,38 @@
+ -rm -f conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
+
+ #>+ 2
+-KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png Makefile.in conffilters.h anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz faxab.h hi32-app-kdeprintfax.png configdlg.h kdeprintfax.h filterdlg.h defcmds.h confgeneral.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h
++KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png conffilters.h Makefile.in anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz hi32-app-kdeprintfax.png faxab.h configdlg.h kdeprintfax.h filterdlg.h confgeneral.h defcmds.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h
+
+ #>+ 2
+ docs-am:
+
+ #>+ 28
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
+ $(mkinstalldirs) $(DESTDIR)$(picdir)/crystalsvg/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/cr16-action-abentry.png $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
+ -rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
+
+ #>+ 15
--- kdeprint/kdeprint_part/Makefile.in
+++ kdeprint/kdeprint_part/Makefile.in
@@ -154,6 +154,7 @@
@@ -85372,6 +88812,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1069,29 +1078,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+
+ #>+ 15
+ force-reedit:
--- kdeprint/kprinter/Makefile.in
+++ kdeprint/kprinter/Makefile.in
@@ -165,6 +165,7 @@
@@ -85687,6 +89169,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -941,29 +950,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+
+ #>+ 15
+ force-reedit:
--- kdeprint/slave/Makefile.in
+++ kdeprint/slave/Makefile.in
@@ -167,6 +167,7 @@
@@ -86212,6 +89736,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -793,7 +802,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop HTMLFile.html CAMERA-Device.desktop linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am
++KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop CAMERA-Device.desktop HTMLFile.html linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am
+
+ #>+ 2
+ docs-am:
--- kdesktop/kwebdesktop/Makefile.in
+++ kdesktop/kwebdesktop/Makefile.in
@@ -156,6 +156,7 @@
@@ -86527,6 +90060,88 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1422,18 +1431,18 @@
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
+
+ #>+ 3
+-minicli.moc: $(srcdir)/minicli.h
+- $(MOC) $(srcdir)/minicli.h -o minicli.moc
++krootwm.moc: $(srcdir)/krootwm.h
++ $(MOC) $(srcdir)/krootwm.h -o krootwm.moc
+
+ #>+ 2
+-mocs: minicli.moc
++mocs: krootwm.moc
+
+ #>+ 3
+-krootwm.moc: $(srcdir)/krootwm.h
+- $(MOC) $(srcdir)/krootwm.h -o krootwm.moc
++minicli.moc: $(srcdir)/minicli.h
++ $(MOC) $(srcdir)/minicli.h -o minicli.moc
+
+ #>+ 2
+-mocs: krootwm.moc
++mocs: minicli.moc
+
+ #>+ 3
+ startupid.moc: $(srcdir)/startupid.h
+@@ -1457,11 +1466,11 @@
+ mocs: desktop.moc
+
+ #>+ 3
+-kdiconview.moc: $(srcdir)/kdiconview.h
+- $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
++pixmapserver.moc: $(srcdir)/pixmapserver.h
++ $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
+
+ #>+ 2
+-mocs: kdiconview.moc
++mocs: pixmapserver.moc
+
+ #>+ 3
+ kcustommenu.moc: $(srcdir)/kcustommenu.h
+@@ -1471,11 +1480,11 @@
+ mocs: kcustommenu.moc
+
+ #>+ 3
+-pixmapserver.moc: $(srcdir)/pixmapserver.h
+- $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
++kdiconview.moc: $(srcdir)/kdiconview.h
++ $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
+
+ #>+ 2
+-mocs: pixmapserver.moc
++mocs: kdiconview.moc
+
+ #>+ 3
+ xautolock.moc: $(srcdir)/xautolock.h
+@@ -1502,7 +1511,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.moc pixmapserver.moc xautolock.moc bgmanager.moc
++ -rm -f krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc
+
+ #>+ 2
+ KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h Makefile.am
+@@ -1571,7 +1580,7 @@
+
+
+ #>+ 11
+-libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc kdesktopsettings.h $(srcdir)/krootwm.cc kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc kdesktopsettings.h $(srcdir)/desktop.cc klaunchsettings.h $(srcdir)/lockeng.cc kdesktopsettings.h $(srcdir)/bgmanager.cc kdesktopsettings.h $(srcdir)/init.cc kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc
++libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc kdesktopsettings.h $(srcdir)/krootwm.cc kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc kdesktopsettings.h $(srcdir)/desktop.cc klaunchsettings.h $(srcdir)/lockeng.cc kdesktopsettings.h $(srcdir)/bgmanager.cc kdesktopsettings.h $(srcdir)/init.cc kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
+ @echo 'creating libkdeinit_kdesktop_la.all_cc.cc ...'; \
+ rm -f libkdeinit_kdesktop_la.all_cc.files libkdeinit_kdesktop_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cc.final; \
+@@ -1583,7 +1592,7 @@
+ rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
+
+ #>+ 11
+-libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp kdesktopsettings.h $(srcdir)/startupid.cpp klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc
++libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp kdesktopsettings.h $(srcdir)/startupid.cpp klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
+ @echo 'creating libkdeinit_kdesktop_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_kdesktop_la.all_cpp.files libkdeinit_kdesktop_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
--- kdesktop/patterns/Makefile.in
+++ kdesktop/patterns/Makefile.in
@@ -117,6 +117,7 @@
@@ -87691,6 +91306,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
kde.desktop: $(top_builddir)/config.status $(srcdir)/kde.desktop.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+@@ -803,7 +812,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in wm2.desktop xfce.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am
++KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am
+
+ #>+ 2
+ docs-am:
--- kdm/kfrontend/themer/Makefile.in
+++ kdm/kfrontend/themer/Makefile.in
@@ -146,6 +146,7 @@
@@ -87796,6 +91420,59 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
+@@ -880,18 +889,18 @@
+ mocs: kdmitem.moc
+
+ #>+ 3
+-kdmthemer.moc: $(srcdir)/kdmthemer.h
+- $(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
++kdmpixmap.moc: $(srcdir)/kdmpixmap.h
++ $(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
+
+ #>+ 2
+-mocs: kdmthemer.moc
++mocs: kdmpixmap.moc
+
+ #>+ 3
+-kdmpixmap.moc: $(srcdir)/kdmpixmap.h
+- $(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
++kdmthemer.moc: $(srcdir)/kdmthemer.h
++ $(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
+
+ #>+ 2
+-mocs: kdmpixmap.moc
++mocs: kdmthemer.moc
+
+ #>+ 3
+ kdmrect.moc: $(srcdir)/kdmrect.h
+@@ -902,7 +911,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
++ -rm -f kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am
+@@ -949,7 +958,7 @@
+
+
+ #>+ 11
+-libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
++libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
+ @echo 'creating libkdmthemer_a.all_cpp.cpp ...'; \
+ rm -f libkdmthemer_a.all_cpp.files libkdmthemer_a.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdmthemer_a.all_cpp.final; \
+@@ -991,8 +1000,8 @@
+ kdmlabel.o: kdmlabel.moc
+ $(srcdir)/kdmitem.cpp: ../../config.ci
+ $(srcdir)/kdmlayout.cpp: ../../config.ci
+-kdmrect.o: kdmrect.moc
+ kdmpixmap.o: kdmpixmap.moc
++kdmrect.o: kdmrect.moc
+ kdmitem.lo: kdmitem.moc
+ kdmpixmap.lo: kdmpixmap.moc
+ nmcheck:
--- kdm/kfrontend/themes/circles/Makefile.in
+++ kdm/kfrontend/themes/circles/Makefile.in
@@ -117,6 +117,7 @@
@@ -88321,6 +91998,32 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1248,8 +1257,6 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+@@ -1258,13 +1265,15 @@
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
+
+ #>+ 15
+ force-reedit:
--- kfind/pics/Makefile.in
+++ kfind/pics/Makefile.in
@@ -107,6 +107,7 @@
@@ -88426,6 +92129,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -734,22 +743,22 @@
+ #>+ 19
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+- $(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+- $(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+- $(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
+- $(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
+ $(INSTALL_DATA) $(srcdir)/lo22-action-delete.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
++ $(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++ $(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ $(INSTALL_DATA) $(srcdir)/lo22-action-idea.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
++ $(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
++ $(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
++ $(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
+- -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
+ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
++ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
++ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
++ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
++ -rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+
+ #>+ 15
+ force-reedit:
--- khelpcenter/htmlsearch/Makefile.in
+++ khelpcenter/htmlsearch/Makefile.in
@@ -186,6 +186,7 @@
@@ -88636,6 +92372,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1307,11 +1316,11 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
+
+ #>+ 3
+-scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
+- $(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
++history.moc: $(srcdir)/history.h
++ $(MOC) $(srcdir)/history.h -o history.moc
+
+ #>+ 2
+-mocs: scrollkeepertreebuilder.moc
++mocs: history.moc
+
+ #>+ 3
+ navigator.moc: $(srcdir)/navigator.h
+@@ -1321,11 +1330,11 @@
+ mocs: navigator.moc
+
+ #>+ 3
+-history.moc: $(srcdir)/history.h
+- $(MOC) $(srcdir)/history.h -o history.moc
++scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
++ $(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
+
+ #>+ 2
+-mocs: history.moc
++mocs: scrollkeepertreebuilder.moc
+
+ #>+ 3
+ fontdialog.moc: $(srcdir)/fontdialog.h
+@@ -1436,10 +1445,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f scrollkeepertreebuilder.moc navigator.moc history.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
++ -rm -f history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
+
+ #>+ 2
+-KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h configure.in.in searchengine.h navigatorappitem.h history.h table-of-contents.xslt application.h formatter.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am
++KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h configure.in.in searchengine.h navigatorappitem.h history.h table-of-contents.xslt formatter.h application.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am
+
+ #>+ 6
+ clean-idl:
+@@ -1499,7 +1508,7 @@
+
+
+ #>+ 11
+-libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc scrollkeepertreebuilder.moc navigator.moc history.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
++libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
+ @echo 'creating libkdeinit_khelpcenter_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_khelpcenter_la.all_cpp.files libkdeinit_khelpcenter_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_khelpcenter_la.all_cpp.final; \
--- khelpcenter/pics/Makefile.in
+++ khelpcenter/pics/Makefile.in
@@ -107,6 +107,7 @@
@@ -88741,6 +92529,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -734,29 +743,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
+
+ #>+ 15
+ force-reedit:
--- khelpcenter/plugins/Applications/Makefile.in
+++ khelpcenter/plugins/Applications/Makefile.in
@@ -117,6 +117,7 @@
@@ -89791,6 +93618,141 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1161,13 +1170,6 @@
+ mocs: gestures_settings_tab.moc
+
+ #>+ 3
+-action_group_tab.moc: $(srcdir)/action_group_tab.h
+- $(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
+-
+-#>+ 2
+-mocs: action_group_tab.moc
+-
+-#>+ 3
+ gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
+ $(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
+
+@@ -1175,11 +1177,11 @@
+ mocs: gesture_triggers_tab.moc
+
+ #>+ 3
+-kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
+- $(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
++action_group_tab.moc: $(srcdir)/action_group_tab.h
++ $(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
+
+ #>+ 2
+-mocs: kcmkhotkeys.moc
++mocs: action_group_tab.moc
+
+ #>+ 3
+ voicerecorder.moc: $(srcdir)/voicerecorder.h
+@@ -1189,6 +1191,13 @@
+ mocs: voicerecorder.moc
+
+ #>+ 3
++kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
++ $(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
++
++#>+ 2
++mocs: kcmkhotkeys.moc
++
++#>+ 3
+ tab_widget.moc: $(srcdir)/tab_widget.h
+ $(MOC) $(srcdir)/tab_widget.h -o tab_widget.moc
+
+@@ -1224,6 +1233,13 @@
+ mocs: action_list_widget.moc
+
+ #>+ 3
++gesturerecorder.moc: $(srcdir)/gesturerecorder.h
++ $(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
++
++#>+ 2
++mocs: gesturerecorder.moc
++
++#>+ 3
+ main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
+ $(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
+
+@@ -1238,13 +1254,6 @@
+ mocs: menuentry_widget.moc
+
+ #>+ 3
+-gesturerecorder.moc: $(srcdir)/gesturerecorder.h
+- $(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
+-
+-#>+ 2
+-mocs: gesturerecorder.moc
+-
+-#>+ 3
+ general_tab.moc: $(srcdir)/general_tab.h
+ $(MOC) $(srcdir)/general_tab.h -o general_tab.moc
+
+@@ -1273,6 +1282,13 @@
+ mocs: gesturerecordpage.moc
+
+ #>+ 3
++triggers_tab.moc: $(srcdir)/triggers_tab.h
++ $(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
++
++#>+ 2
++mocs: triggers_tab.moc
++
++#>+ 3
+ windowselector.moc: $(srcdir)/windowselector.h
+ $(MOC) $(srcdir)/windowselector.h -o windowselector.moc
+
+@@ -1287,13 +1303,6 @@
+ mocs: command_url_widget.moc
+
+ #>+ 3
+-triggers_tab.moc: $(srcdir)/triggers_tab.h
+- $(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
+-
+-#>+ 2
+-mocs: triggers_tab.moc
+-
+-#>+ 3
+ keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
+ $(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
+
+@@ -1332,7 +1341,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc windowselector.moc command_url_widget.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++ -rm -f gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc main_buttons_widget.moc menuentry_widget.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc triggers_tab.moc windowselector.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
+
+ #>+ 2
+ KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am
+@@ -1346,14 +1355,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-khotkeys.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-khotkeys.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khotkeys.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-khotkeys.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khotkeys.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khotkeys.png
+
+ #>+ 15
+ force-reedit:
+@@ -1394,7 +1403,7 @@
+
+
+ #>+ 11
+-kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc triggers_tab.moc command_url_widget.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc menuentry_widget.moc main_buttons_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc command_url_widget.moc windowselector.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
+ @echo 'creating kcm_khotkeys_la.all_cpp.cpp ...'; \
+ rm -f kcm_khotkeys_la.all_cpp.files kcm_khotkeys_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
--- khotkeys/kcontrol/ui/Makefile.in
+++ khotkeys/kcontrol/ui/Makefile.in
@@ -142,6 +142,7 @@
@@ -89896,6 +93858,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -872,7 +881,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui Makefile.in dcop_widget_ui.ui menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
++KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui dcop_widget_ui.ui Makefile.in menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am
+
+ #>+ 23
+ clean-ui:
--- khotkeys/Makefile.in
+++ khotkeys/Makefile.in
@@ -134,6 +134,7 @@
@@ -91261,6 +95232,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -933,22 +942,22 @@
+
+
+ #>+ 3
+-swallow.moc: $(srcdir)/swallow.h
+- $(MOC) $(srcdir)/swallow.h -o swallow.moc
++prefwidget.moc: $(srcdir)/prefwidget.h
++ $(MOC) $(srcdir)/prefwidget.h -o prefwidget.moc
+
+ #>+ 2
+-mocs: swallow.moc
++mocs: prefwidget.moc
+
+ #>+ 3
+-prefwidget.moc: $(srcdir)/prefwidget.h
+- $(MOC) $(srcdir)/prefwidget.h -o prefwidget.moc
++swallow.moc: $(srcdir)/swallow.h
++ $(MOC) $(srcdir)/swallow.h -o swallow.moc
+
+ #>+ 2
+-mocs: prefwidget.moc
++mocs: swallow.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f swallow.moc prefwidget.moc
++ -rm -f prefwidget.moc swallow.moc
+
+ #>+ 2
+ KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am
+@@ -1004,7 +1013,7 @@
+
+
+ #>+ 11
+-swallow_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/swallow.cpp $(srcdir)/prefwidget.cpp prefwidgetbase.cpp prefwidgetbase.moc prefwidget.moc swallow.moc
++swallow_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/swallow.cpp $(srcdir)/prefwidget.cpp prefwidgetbase.cpp prefwidgetbase.moc swallow.moc prefwidget.moc
+ @echo 'creating swallow_panelapplet_la.all_cpp.cpp ...'; \
+ rm -f swallow_panelapplet_la.all_cpp.files swallow_panelapplet_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> swallow_panelapplet_la.all_cpp.final; \
+@@ -1044,8 +1053,8 @@
+ swallow.o: swallow.moc
+ $(srcdir)/prefwidget.cpp: prefwidgetbase.h
+ nmcheck-am: nmcheck
+-prefwidget.lo: prefwidget.moc
+ swallow.lo: swallow.moc
++prefwidget.lo: prefwidget.moc
+ $(srcdir)/swallow.cpp: prefwidgetbase.h
+ prefwidget.o: prefwidget.moc
+
--- kicker/applets/systemtray/Makefile.in
+++ kicker/applets/systemtray/Makefile.in
@@ -158,6 +158,7 @@
@@ -91891,6 +95911,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -897,27 +906,27 @@
+
+ #>+ 23
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+
+ #>+ 15
+ force-reedit:
--- kicker/data/kmenu_side/Makefile.in
+++ kicker/data/kmenu_side/Makefile.in
@@ -117,6 +117,7 @@
@@ -92206,6 +96262,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -805,7 +814,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_tigereye_tiny_up.png solid_gray_large_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png light_pastel_normal_up.png solid_gray_normal_down.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png
++KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_gray_large_up.png solid_tigereye_tiny_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png solid_gray_normal_down.png light_pastel_normal_up.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png
+
+ #>+ 2
+ docs-am:
--- kicker/data/wallpaper/Makefile.in
+++ kicker/data/wallpaper/Makefile.in
@@ -117,6 +117,7 @@
@@ -92521,6 +96586,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1101,6 +1110,13 @@
+ mocs: kasbarextension.moc
+
+ #>+ 3
++kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
++ $(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
++
++#>+ 2
++mocs: kasaboutdlg.moc
++
++#>+ 3
+ kasclockitem.moc: $(srcdir)/kasclockitem.h
+ $(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
+
+@@ -1115,13 +1131,6 @@
+ mocs: kasitem.moc
+
+ #>+ 3
+-kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
+- $(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
+-
+-#>+ 2
+-mocs: kasaboutdlg.moc
+-
+-#>+ 3
+ kasresources.moc: $(srcdir)/kasresources.h
+ $(MOC) $(srcdir)/kasresources.h -o kasresources.moc
+
+@@ -1181,7 +1190,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasclockitem.moc kasitem.moc kasaboutdlg.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
++ -rm -f kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasaboutdlg.moc kasclockitem.moc kasitem.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
+
+ #>+ 2
+ KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
--- kicker/extensions/Makefile.in
+++ kicker/extensions/Makefile.in
@@ -123,6 +123,7 @@
@@ -92941,6 +97043,68 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -959,11 +968,11 @@
+ mocs: servicebutton.moc
+
+ #>+ 3
+-kbutton.moc: $(srcdir)/kbutton.h
+- $(MOC) $(srcdir)/kbutton.h -o kbutton.moc
++desktopbutton.moc: $(srcdir)/desktopbutton.h
++ $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
+
+ #>+ 2
+-mocs: kbutton.moc
++mocs: desktopbutton.moc
+
+ #>+ 3
+ servicemenubutton.moc: $(srcdir)/servicemenubutton.h
+@@ -973,11 +982,11 @@
+ mocs: servicemenubutton.moc
+
+ #>+ 3
+-desktopbutton.moc: $(srcdir)/desktopbutton.h
+- $(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
++kbutton.moc: $(srcdir)/kbutton.h
++ $(MOC) $(srcdir)/kbutton.h -o kbutton.moc
+
+ #>+ 2
+-mocs: desktopbutton.moc
++mocs: kbutton.moc
+
+ #>+ 3
+ nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
+@@ -995,10 +1004,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++ -rm -f browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
+
+ #>+ 2
+-KDE_DIST=servicemenubutton.h servicebutton.h kmenu.desktop windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarks.desktop bookmarksbutton.h extensionbutton.h browserbutton.h desktop.desktop browser.desktop kbutton.h exec.desktop Makefile.am windowlist.desktop
++KDE_DIST=servicemenubutton.h servicebutton.h kmenu.desktop windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarks.desktop bookmarksbutton.h extensionbutton.h browserbutton.h desktop.desktop browser.desktop exec.desktop kbutton.h Makefile.am windowlist.desktop
+
+ #>+ 2
+ docs-am:
+@@ -1042,7 +1051,7 @@
+
+
+ #>+ 11
+-libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
+ @echo 'creating libkicker_buttons_la.all_cpp.cpp ...'; \
+ rm -f libkicker_buttons_la.all_cpp.files libkicker_buttons_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkicker_buttons_la.all_cpp.final; \
+@@ -1081,8 +1090,8 @@
+ extensionbutton.o: extensionbutton.moc
+ urlbutton.o: urlbutton.moc
+ nonkdeappbutton.lo: nonkdeappbutton.moc
+-desktopbutton.o: desktopbutton.moc
+ servicemenubutton.lo: servicemenubutton.moc
++desktopbutton.o: desktopbutton.moc
+ extensionbutton.lo: extensionbutton.moc
+ bookmarksbutton.lo: bookmarksbutton.moc
+ kbutton.o: kbutton.moc
--- kicker/kicker/core/Makefile.in
+++ kicker/kicker/core/Makefile.in
@@ -164,6 +164,7 @@
@@ -93046,6 +97210,99 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -984,18 +993,18 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
+
+ #>+ 3
+-container_extension.moc: $(srcdir)/container_extension.h
+- $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
++container_base.moc: $(srcdir)/container_base.h
++ $(MOC) $(srcdir)/container_base.h -o container_base.moc
+
+ #>+ 2
+-mocs: container_extension.moc
++mocs: container_base.moc
+
+ #>+ 3
+-container_base.moc: $(srcdir)/container_base.h
+- $(MOC) $(srcdir)/container_base.h -o container_base.moc
++container_extension.moc: $(srcdir)/container_extension.h
++ $(MOC) $(srcdir)/container_extension.h -o container_extension.moc
+
+ #>+ 2
+-mocs: container_base.moc
++mocs: container_extension.moc
+
+ #>+ 3
+ container_applet.moc: $(srcdir)/container_applet.h
+@@ -1033,18 +1042,18 @@
+ mocs: pluginmanager.moc
+
+ #>+ 3
+-container_button.moc: $(srcdir)/container_button.h
+- $(MOC) $(srcdir)/container_button.h -o container_button.moc
++unhidetrigger.moc: $(srcdir)/unhidetrigger.h
++ $(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
+
+ #>+ 2
+-mocs: container_button.moc
++mocs: unhidetrigger.moc
+
+ #>+ 3
+-unhidetrigger.moc: $(srcdir)/unhidetrigger.h
+- $(MOC) $(srcdir)/unhidetrigger.h -o unhidetrigger.moc
++container_button.moc: $(srcdir)/container_button.h
++ $(MOC) $(srcdir)/container_button.h -o container_button.moc
+
+ #>+ 2
+-mocs: unhidetrigger.moc
++mocs: container_button.moc
+
+ #>+ 3
+ showdesktop.moc: $(srcdir)/showdesktop.h
+@@ -1061,18 +1070,18 @@
+ mocs: extensionmanager.moc
+
+ #>+ 3
+-kicker.moc: $(srcdir)/kicker.h
+- $(MOC) $(srcdir)/kicker.h -o kicker.moc
++panelextension.moc: $(srcdir)/panelextension.h
++ $(MOC) $(srcdir)/panelextension.h -o panelextension.moc
+
+ #>+ 2
+-mocs: kicker.moc
++mocs: panelextension.moc
+
+ #>+ 3
+-panelextension.moc: $(srcdir)/panelextension.h
+- $(MOC) $(srcdir)/panelextension.h -o panelextension.moc
++kicker.moc: $(srcdir)/kicker.h
++ $(MOC) $(srcdir)/kicker.h -o kicker.moc
+
+ #>+ 2
+-mocs: panelextension.moc
++mocs: kicker.moc
+
+ #>+ 3
+ userrectsel.moc: $(srcdir)/userrectsel.h
+@@ -1083,7 +1092,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f container_extension.moc container_base.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
++ -rm -f container_base.moc container_extension.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
+
+ #>+ 2
+ KDE_DIST=extensionmanager.h kicker.h container_extension.h showdesktop.h menumanager.h container_button.h Makefile.in panelextension.h default-apps extensionSettings.kcfgc childpanelextension.desktop unhidetrigger.h applethandle.h container_base.h extensionSettings.kcfg kickerbindings.cpp pluginmanager.h containerarea.h containerarealayout.h container_applet.h userrectsel.h Makefile.am
+@@ -1141,7 +1150,7 @@
+
+
+ #>+ 11
+-libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_base.moc container_extension.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
++libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp container_extension.moc container_base.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
+ @echo 'creating libkicker_core_la.all_cpp.cpp ...'; \
+ rm -f libkicker_core_la.all_cpp.files libkicker_core_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
--- kicker/kicker/Makefile.in
+++ kicker/kicker/Makefile.in
@@ -202,6 +202,7 @@
@@ -93256,6 +97513,97 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -952,11 +961,11 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub k_mnu.kidl
+
+ #>+ 3
+-appletwidget.moc: $(srcdir)/appletwidget.h
+- $(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
++addapplet.moc: $(srcdir)/addapplet.h
++ $(MOC) $(srcdir)/addapplet.h -o addapplet.moc
+
+ #>+ 2
+-mocs: appletwidget.moc
++mocs: addapplet.moc
+
+ #>+ 3
+ exe_dlg.moc: $(srcdir)/exe_dlg.h
+@@ -966,11 +975,11 @@
+ mocs: exe_dlg.moc
+
+ #>+ 3
+-addapplet.moc: $(srcdir)/addapplet.h
+- $(MOC) $(srcdir)/addapplet.h -o addapplet.moc
++appletwidget.moc: $(srcdir)/appletwidget.h
++ $(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
+
+ #>+ 2
+-mocs: addapplet.moc
++mocs: appletwidget.moc
+
+ #>+ 3
+ hidebutton.moc: $(srcdir)/hidebutton.h
+@@ -1064,18 +1073,18 @@
+ mocs: addappletvisualfeedback.moc
+
+ #>+ 3
+-client_mnu.moc: $(srcdir)/client_mnu.h
+- $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
++quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
++ $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
+
+ #>+ 2
+-mocs: client_mnu.moc
++mocs: quickbrowser_mnu.moc
+
+ #>+ 3
+-quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
+- $(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
++client_mnu.moc: $(srcdir)/client_mnu.h
++ $(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
+
+ #>+ 2
+-mocs: quickbrowser_mnu.moc
++mocs: client_mnu.moc
+
+ #>+ 3
+ addextension_mnu.moc: $(srcdir)/addextension_mnu.h
+@@ -1086,7 +1095,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f appletwidget.moc exe_dlg.moc addapplet.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc client_mnu.moc quickbrowser_mnu.moc addextension_mnu.moc
++ -rm -f addapplet.moc exe_dlg.moc appletwidget.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc quickbrowser_mnu.moc client_mnu.moc addextension_mnu.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in appletitem.ui nonKDEButtonSettings.ui panelmenuiteminfo.h appletview.ui Makefile.am
+@@ -1145,7 +1154,7 @@
+
+
+ #>+ 11
+-libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp addapplet.moc exe_dlg.moc appletwidget.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
++libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp appletwidget.moc exe_dlg.moc addapplet.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
+ @echo 'creating libkicker_ui_la.all_cpp.cpp ...'; \
+ rm -f libkicker_ui_la.all_cpp.files libkicker_ui_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
+@@ -1186,7 +1195,7 @@
+ addappletvisualfeedback.o: addappletvisualfeedback.moc
+ addextension_mnu.o: addextension_mnu.moc
+ browser_dlg.lo: browser_dlg.moc
+-addapplet.o: appletwidget.moc addapplet.moc
++addapplet.o: addapplet.moc appletwidget.moc
+ appletop_mnu.o: appletop_mnu.moc
+ $(srcdir)/extensionop_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ $(srcdir)/addappletvisualfeedback.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+@@ -1196,7 +1205,7 @@
+ $(srcdir)/removecontainer_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ $(srcdir)/removeextension_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ addbutton_mnu.o: addbutton_mnu.moc
+-addapplet.lo: appletwidget.moc addapplet.moc
++addapplet.lo: addapplet.moc appletwidget.moc
+ nmcheck-am: nmcheck
+ $(srcdir)/browser_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
+ $(srcdir)/removeapplet_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h
--- kicker/libkicker/Makefile.in
+++ kicker/libkicker/Makefile.in
@@ -156,6 +156,7 @@
@@ -93361,6 +97709,55 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -959,22 +968,22 @@
+ mocs: panelbutton.moc
+
+ #>+ 3
+-simplebutton.moc: $(srcdir)/simplebutton.h
+- $(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
++kickertip.moc: $(srcdir)/kickertip.h
++ $(MOC) $(srcdir)/kickertip.h -o kickertip.moc
+
+ #>+ 2
+-mocs: simplebutton.moc
++mocs: kickertip.moc
+
+ #>+ 3
+-kickertip.moc: $(srcdir)/kickertip.h
+- $(MOC) $(srcdir)/kickertip.h -o kickertip.moc
++simplebutton.moc: $(srcdir)/simplebutton.h
++ $(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
+
+ #>+ 2
+-mocs: kickertip.moc
++mocs: simplebutton.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f panner.moc panelbutton.moc simplebutton.moc kickertip.moc
++ -rm -f panner.moc panelbutton.moc kickertip.moc simplebutton.moc
+
+ #>+ 2
+ KDE_DIST=menuinfo.h paneldrag.h simplebutton.h global.h panelbutton.h Makefile.in kickerSettings.kcfgc kickertip.h kshadowengine.h panner.h kshadowsettings.h kickerSettings.kcfg appletinfo.h Makefile.am
+@@ -1030,7 +1039,7 @@
+
+
+ #>+ 11
+-libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp panner.moc panelbutton.moc kickertip.moc simplebutton.moc
++libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp panner.moc panelbutton.moc simplebutton.moc kickertip.moc
+ @echo 'creating libkickermain_la.all_cpp.cpp ...'; \
+ rm -f libkickermain_la.all_cpp.files libkickermain_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkickermain_la.all_cpp.final; \
+@@ -1084,8 +1093,8 @@
+ simplebutton.lo: simplebutton.moc
+ $(srcdir)/simplebutton.cpp: kickerSettings.h
+ $(srcdir)/paneldrag.cpp: kickerSettings.h
+-$(srcdir)/panelbutton.cpp: kickerSettings.h
+ panner.lo: panner.moc
++$(srcdir)/panelbutton.cpp: kickerSettings.h
+
+ #>+ 6
+ kickerSettings.cpp: kickerSettings.h
--- kicker/Makefile.in
+++ kicker/Makefile.in
@@ -124,6 +124,7 @@
@@ -94621,6 +99018,40 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1062,18 +1071,18 @@
+ extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
+
+ #>+ 3
+-appletproxy.moc: $(srcdir)/appletproxy.h
+- $(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
++extensionproxy.moc: $(srcdir)/extensionproxy.h
++ $(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
+
+ #>+ 2
+-mocs: appletproxy.moc
++mocs: extensionproxy.moc
+
+ #>+ 3
+-extensionproxy.moc: $(srcdir)/extensionproxy.h
+- $(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
++appletproxy.moc: $(srcdir)/appletproxy.h
++ $(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
+
+ #>+ 2
+-mocs: extensionproxy.moc
++mocs: appletproxy.moc
+
+ #>+ 3
+ extensiondebugger.moc: $(srcdir)/extensiondebugger.h
+@@ -1084,7 +1093,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f appletproxy.moc extensionproxy.moc extensiondebugger.moc
++ -rm -f extensionproxy.moc appletproxy.moc extensiondebugger.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am
--- kicker/taskbar/Makefile.in
+++ kicker/taskbar/Makefile.in
@@ -156,6 +156,7 @@
@@ -96091,6 +100522,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -954,14 +963,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-mac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-mac.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mac.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-mac.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mac.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mac.png
+
+ #>+ 15
+ force-reedit:
--- kioslave/Makefile.in
+++ kioslave/Makefile.in
@@ -125,6 +125,7 @@
@@ -96826,6 +101275,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1034,7 +1043,7 @@
+ -rm -f removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
+
+ #>+ 2
+-KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am
++KDE_DIST=fstabbackend.h linuxcdpolling.h mediadirnotify.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am
+
+ #>+ 5
+ clean-idl:
--- kioslave/media/medianotifier/Makefile.in
+++ kioslave/media/medianotifier/Makefile.in
@@ -160,6 +160,7 @@
@@ -99241,6 +103699,88 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1254,18 +1263,18 @@
+ mocs: history.moc
+
+ #>+ 3
+-urlgrabber.moc: $(srcdir)/urlgrabber.h
+- $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
++configdialog.moc: $(srcdir)/configdialog.h
++ $(MOC) $(srcdir)/configdialog.h -o configdialog.moc
+
+ #>+ 2
+-mocs: urlgrabber.moc
++mocs: configdialog.moc
+
+ #>+ 3
+-configdialog.moc: $(srcdir)/configdialog.h
+- $(MOC) $(srcdir)/configdialog.h -o configdialog.moc
++urlgrabber.moc: $(srcdir)/urlgrabber.h
++ $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
+
+ #>+ 2
+-mocs: configdialog.moc
++mocs: urlgrabber.moc
+
+ #>+ 3
+ clipboardpoll.moc: $(srcdir)/clipboardpoll.h
+@@ -1304,7 +1313,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f history.moc urlgrabber.moc configdialog.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
++ -rm -f history.moc configdialog.moc urlgrabber.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
+
+ #>+ 2
+ KDE_DIST=popupproxy.h klipperbindings.cpp historyurlitem.h Makefile.in hisc-app-klipper.svgz historystringitem.h hi32-app-klipper.png urlgrabber.h klipperrc.upd configure.in.in configdialog.h klipper-1-2.pl history.h klippershortcuts.upd applet.h toplevel.h hi128-app-klipper.png hi48-app-klipper.png klipperrc.desktop klipperpopup.h klipper.desktop hi22-app-klipper.png hi16-app-klipper.png clipboardpoll.h klipper-kde31.sh historyitem.h hi64-app-klipper.png historyimageitem.h version.h Makefile.am
+@@ -1320,29 +1329,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+
+ #>+ 15
+ force-reedit:
+@@ -1395,7 +1404,7 @@
+ rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
+
+ #>+ 11
+-libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp history.moc configdialog.moc urlgrabber.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
++libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp history.moc urlgrabber.moc configdialog.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
+ @echo 'creating libklipper_common_la.all_cpp.cpp ...'; \
+ rm -f libklipper_common_la.all_cpp.files libklipper_common_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
--- kmenuedit/Makefile.in
+++ kmenuedit/Makefile.in
@@ -211,6 +211,7 @@
@@ -99346,6 +103886,33 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1313,20 +1322,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
+
+ #>+ 15
+ force-reedit:
--- kmenuedit/pixmaps/Makefile.in
+++ kmenuedit/pixmaps/Makefile.in
@@ -107,6 +107,7 @@
@@ -99451,6 +104018,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -735,34 +744,34 @@
+
+ #>+ 30
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++ $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
+- $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+- $(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++ $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++ $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
+- $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
+ $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+- $(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++ -rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++ -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
+ -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+- -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+- -rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
+- -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++ -rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++ -rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++ -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+ -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
+ -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+- -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+- -rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++ -rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
+
+ #>+ 15
+ force-reedit:
--- knetattach/Makefile.in
+++ knetattach/Makefile.in
@@ -153,6 +153,7 @@
@@ -99556,6 +104174,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -916,7 +925,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=hi22-app-knetattach.png hisc-app-knetattach.svgz hi128-app-knetattach.png Makefile.in knetattach.ui hi64-app-knetattach.png knetattach.ui.h hi16-app-knetattach.png hi48-app-knetattach.png knetattach.desktop hi32-app-knetattach.png Makefile.am
++KDE_DIST=hi22-app-knetattach.png hi128-app-knetattach.png hisc-app-knetattach.svgz Makefile.in knetattach.ui hi64-app-knetattach.png knetattach.ui.h hi16-app-knetattach.png hi48-app-knetattach.png knetattach.desktop hi32-app-knetattach.png Makefile.am
+
+ #>+ 4
+ clean-ui:
+@@ -928,29 +937,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
+
+ #>+ 15
+ force-reedit:
--- konqueror/about/Makefile.in
+++ konqueror/about/Makefile.in
@@ -155,6 +155,7 @@
@@ -99976,6 +104645,116 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1130,18 +1139,18 @@
+ mocs: updater.moc
+
+ #>+ 3
+-importers.moc: $(srcdir)/importers.h
+- $(MOC) $(srcdir)/importers.h -o importers.moc
++toplevel.moc: $(srcdir)/toplevel.h
++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+
+ #>+ 2
+-mocs: importers.moc
++mocs: toplevel.moc
+
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++importers.moc: $(srcdir)/importers.h
++ $(MOC) $(srcdir)/importers.h -o importers.moc
+
+ #>+ 2
+-mocs: toplevel.moc
++mocs: importers.moc
+
+ #>+ 3
+ bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
+@@ -1151,18 +1160,18 @@
+ mocs: bookmarkinfo.moc
+
+ #>+ 3
+-kebsearchline.moc: $(srcdir)/kebsearchline.h
+- $(MOC) $(srcdir)/kebsearchline.h -o kebsearchline.moc
++testlink.moc: $(srcdir)/testlink.h
++ $(MOC) $(srcdir)/testlink.h -o testlink.moc
+
+ #>+ 2
+-mocs: kebsearchline.moc
++mocs: testlink.moc
+
+ #>+ 3
+-listview.moc: $(srcdir)/listview.h
+- $(MOC) $(srcdir)/listview.h -o listview.moc
++kebsearchline.moc: $(srcdir)/kebsearchline.h
++ $(MOC) $(srcdir)/kebsearchline.h -o kebsearchline.moc
+
+ #>+ 2
+-mocs: listview.moc
++mocs: kebsearchline.moc
+
+ #>+ 3
+ dcop.moc: $(srcdir)/dcop.h
+@@ -1172,18 +1181,18 @@
+ mocs: dcop.moc
+
+ #>+ 3
+-testlink.moc: $(srcdir)/testlink.h
+- $(MOC) $(srcdir)/testlink.h -o testlink.moc
++listview.moc: $(srcdir)/listview.h
++ $(MOC) $(srcdir)/listview.h -o listview.moc
+
+ #>+ 2
+-mocs: testlink.moc
++mocs: listview.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc importers.moc toplevel.moc bookmarkinfo.moc kebsearchline.moc listview.moc dcop.moc testlink.moc
++ -rm -f favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc testlink.moc kebsearchline.moc dcop.moc listview.moc
+
+ #>+ 2
+-KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am
++KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr32-app-keditbookmarks.png cr64-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am
+
+ #>+ 5
+ clean-idl:
+@@ -1201,20 +1210,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
+
+ #>+ 15
+ force-reedit:
+@@ -1255,7 +1264,7 @@
+
+
+ #>+ 11
+-libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp settings.h $(srcdir)/toplevel.cpp settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp settings.h favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc importers.moc toplevel.moc testlink.moc dcop.moc listview.moc bookmarkinfo.moc kebsearchline.moc
++libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp settings.h $(srcdir)/toplevel.cpp settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp settings.h favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc listview.moc dcop.moc kebsearchline.moc bookmarkinfo.moc testlink.moc
+ @echo 'creating libkdeinit_keditbookmarks_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_keditbookmarks_la.all_cpp.files libkdeinit_keditbookmarks_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
--- konqueror/kttsplugin/Makefile.in
+++ konqueror/kttsplugin/Makefile.in
@@ -150,6 +150,7 @@
@@ -100291,6 +105070,71 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1483,6 +1492,13 @@
+ mocs: konq_frame.moc
+
+ #>+ 3
++konq_tabs.moc: $(srcdir)/konq_tabs.h
++ $(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
++
++#>+ 2
++mocs: konq_tabs.moc
++
++#>+ 3
+ konq_misc.moc: $(srcdir)/konq_misc.h
+ $(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
+
+@@ -1497,11 +1513,11 @@
+ mocs: konq_browseriface.moc
+
+ #>+ 3
+-konq_tabs.moc: $(srcdir)/konq_tabs.h
+- $(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
++konq_view.moc: $(srcdir)/konq_view.h
++ $(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+
+ #>+ 2
+-mocs: konq_tabs.moc
++mocs: konq_view.moc
+
+ #>+ 3
+ konq_run.moc: $(srcdir)/konq_run.h
+@@ -1511,13 +1527,6 @@
+ mocs: konq_run.moc
+
+ #>+ 3
+-konq_view.moc: $(srcdir)/konq_view.h
+- $(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+-
+-#>+ 2
+-mocs: konq_view.moc
+-
+-#>+ 3
+ konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
+ $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
+
+@@ -1556,10 +1565,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_misc.moc konq_browseriface.moc konq_tabs.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
++ -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
+
+ #>+ 2
+-KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
++KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop IDEAS konq-simplebrowser.rc konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am
+
+ #>+ 6
+ clean-idl:
+@@ -1619,7 +1628,7 @@
+
+
+ #>+ 11
+-libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc konq_settingsxt.h $(srcdir)/KonquerorIface.cc konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc konq_settingsxt.h $(srcdir)/konq_viewmgr.cc konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc konq_settingsxt.h $(srcdir)/konq_actions.cc konq_settingsxt.h $(srcdir)/konq_profiledlg.cc konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
++libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc konq_settingsxt.h $(srcdir)/KonquerorIface.cc konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc konq_settingsxt.h $(srcdir)/konq_viewmgr.cc konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc konq_settingsxt.h $(srcdir)/konq_actions.cc konq_settingsxt.h $(srcdir)/konq_profiledlg.cc konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_tabs.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
+ @echo 'creating libkdeinit_konqueror_la.all_cc.cc ...'; \
+ rm -f libkdeinit_konqueror_la.all_cc.files libkdeinit_konqueror_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
--- konqueror/pics/actions/Makefile.in
+++ konqueror/pics/actions/Makefile.in
@@ -107,6 +107,7 @@
@@ -100396,6 +105240,31 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -734,20 +743,20 @@
+ #>+ 17
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
+- -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+ -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
+ -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+ -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
+ -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++ -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
++ -rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
+
+ #>+ 15
+ force-reedit:
--- konqueror/pics/indicators/Makefile.in
+++ konqueror/pics/indicators/Makefile.in
@@ -117,6 +117,7 @@
@@ -100606,6 +105475,65 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -897,39 +906,39 @@
+
+ #>+ 35
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
++ $(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
++ $(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+- $(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
+- $(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ $(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+- $(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+- $(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
+
+ #>+ 15
+ force-reedit:
--- konqueror/pics/tiles/Makefile.in
+++ konqueror/pics/tiles/Makefile.in
@@ -117,6 +117,7 @@
@@ -100921,6 +105849,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -759,7 +768,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-pas-print.desktop text-c++-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-css-print.desktop text-ada-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am
++KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-c++-print.desktop text-pas-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-ada-print.desktop text-css-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am
+
+ #>+ 2
+ docs-am:
--- konqueror/remoteencodingplugin/Makefile.in
+++ konqueror/remoteencodingplugin/Makefile.in
@@ -151,6 +151,7 @@
@@ -102819,6 +107756,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1243,18 +1252,18 @@
+ mocs: TEWidget.moc
+
+ #>+ 3
+-konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
+- $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
++TEmulation.moc: $(srcdir)/TEmulation.h
++ $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
+
+ #>+ 2
+-mocs: konsolebookmarkhandler.moc
++mocs: TEmulation.moc
+
+ #>+ 3
+-TEmulation.moc: $(srcdir)/TEmulation.h
+- $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
++konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
++ $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
+
+ #>+ 2
+-mocs: TEmulation.moc
++mocs: konsolebookmarkhandler.moc
+
+ #>+ 3
+ konsole.moc: $(srcdir)/konsole.h
+@@ -1299,18 +1308,18 @@
+ mocs: konsole_part.moc
+
+ #>+ 3
+-TEPty.moc: $(srcdir)/TEPty.h
+- $(MOC) $(srcdir)/TEPty.h -o TEPty.moc
++printsettings.moc: $(srcdir)/printsettings.h
++ $(MOC) $(srcdir)/printsettings.h -o printsettings.moc
+
+ #>+ 2
+-mocs: TEPty.moc
++mocs: printsettings.moc
+
+ #>+ 3
+-printsettings.moc: $(srcdir)/printsettings.h
+- $(MOC) $(srcdir)/printsettings.h -o printsettings.moc
++TEPty.moc: $(srcdir)/TEPty.h
++ $(MOC) $(srcdir)/TEPty.h -o TEPty.moc
+
+ #>+ 2
+-mocs: printsettings.moc
++mocs: TEPty.moc
+
+ #>+ 5
+ kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
+@@ -1329,7 +1338,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kwrited.moc TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc printsettings.moc
++ -rm -f kwrited.moc TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc printsettings.moc TEPty.moc
+
+ #>+ 2
+ KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am
+@@ -1389,7 +1398,7 @@
+
+
+ #>+ 11
+-libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc printsettings.moc TEPty.moc
++libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc TEPty.moc printsettings.moc
+ @echo 'creating libkdeinit_konsole_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_konsole_la.all_cpp.files libkdeinit_konsole_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_konsole_la.all_cpp.final; \
+@@ -1467,8 +1476,8 @@
+ @rm -f konsole$(EXEEXT)
+ $(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
+
+-TEmulation.lo: TEmulation.moc
+ konsolebookmarkhandler.lo: konsolebookmarkhandler.moc
++TEmulation.lo: TEmulation.moc
+ konsole_part.o: konsole_part.moc
+ konsolebookmarkhandler.o: konsolebookmarkhandler.moc
+ nmcheck-am: nmcheck
--- konsole/Makefile.in
+++ konsole/Makefile.in
@@ -150,6 +150,7 @@
@@ -103029,6 +108044,70 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -726,7 +735,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr16-action-activity.png cr22-action-konsoleblue.png cr16-action-konsolered.png cr32-action-opentermred.png cr22-action-opentermblue.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr16-action-konsoleblue.png cr22-action-konsolered.png cr32-action-opentermblue.png cr32-action-konsoleblue.png cr16-action-opentermred.png cr32-action-konsolered.png Makefile.am
++KDE_DIST=cr16-action-activity.png cr22-action-konsoleblue.png cr16-action-konsolered.png cr22-action-opentermblue.png cr32-action-opentermred.png Makefile.in cr16-action-silence.png cr16-action-opentermblue.png cr22-action-opentermred.png cr16-action-konsoleblue.png cr22-action-konsolered.png cr32-action-opentermblue.png cr32-action-konsoleblue.png cr16-action-opentermred.png cr32-action-konsolered.png Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -734,37 +743,37 @@
+ #>+ 35
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+ $(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-activity.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
+ $(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
+- -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
++ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
+ -rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
+
+ #>+ 15
--- konsole/other/Makefile.in
+++ konsole/other/Makefile.in
@@ -135,6 +135,7 @@
@@ -103134,6 +108213,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -965,29 +974,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ $(INSTALL_DATA) $(srcdir)/hisc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
+
+ #>+ 15
+ force-reedit:
--- konsole/other/wallpapers/Makefile.in
+++ konsole/other/wallpapers/Makefile.in
@@ -117,6 +117,7 @@
@@ -103344,6 +108465,33 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -970,20 +979,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+
+ #>+ 15
+ force-reedit:
--- kpersonalizer/Makefile.in
+++ kpersonalizer/Makefile.in
@@ -173,6 +173,7 @@
@@ -103449,6 +108597,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1109,18 +1118,18 @@
+ mocs: krefinepage.moc
+
+ #>+ 3
+-kpersonalizer.moc: $(srcdir)/kpersonalizer.h
+- $(MOC) $(srcdir)/kpersonalizer.h -o kpersonalizer.moc
++kstylepage.moc: $(srcdir)/kstylepage.h
++ $(MOC) $(srcdir)/kstylepage.h -o kstylepage.moc
+
+ #>+ 2
+-mocs: kpersonalizer.moc
++mocs: kstylepage.moc
+
+ #>+ 3
+-kstylepage.moc: $(srcdir)/kstylepage.h
+- $(MOC) $(srcdir)/kstylepage.h -o kstylepage.moc
++kpersonalizer.moc: $(srcdir)/kpersonalizer.h
++ $(MOC) $(srcdir)/kpersonalizer.h -o kpersonalizer.moc
+
+ #>+ 2
+-mocs: kstylepage.moc
++mocs: kpersonalizer.moc
+
+ #>+ 3
+ kospage.moc: $(srcdir)/kospage.h
+@@ -1131,7 +1140,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kcountrypage.moc keyecandypage.moc krefinepage.moc kpersonalizer.moc kstylepage.moc kospage.moc
++ -rm -f kcountrypage.moc keyecandypage.moc krefinepage.moc kstylepage.moc kpersonalizer.moc kospage.moc
+
+ #>+ 2
+ KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am
+@@ -1151,14 +1160,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+
+ #>+ 15
+ force-reedit:
--- kpersonalizer/pics/Makefile.in
+++ kpersonalizer/pics/Makefile.in
@@ -117,6 +117,7 @@
@@ -104079,6 +109279,42 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -732,26 +741,26 @@
+
+ #>+ 22
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+
+ #>+ 15
+ force-reedit:
--- ksplashml/Makefile.in
+++ ksplashml/Makefile.in
@@ -172,6 +172,7 @@
@@ -106074,6 +111310,67 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -970,13 +979,6 @@
+ mocs: SensorSocketAgent.moc
+
+ #>+ 3
+-StyleSettings.moc: $(srcdir)/StyleSettings.h
+- $(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
+-
+-#>+ 2
+-mocs: StyleSettings.moc
+-
+-#>+ 3
+ SensorManager.moc: $(srcdir)/SensorManager.h
+ $(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
+
+@@ -984,11 +986,11 @@
+ mocs: SensorManager.moc
+
+ #>+ 3
+-StyleEngine.moc: $(srcdir)/StyleEngine.h
+- $(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
++StyleSettings.moc: $(srcdir)/StyleSettings.h
++ $(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
+
+ #>+ 2
+-mocs: StyleEngine.moc
++mocs: StyleSettings.moc
+
+ #>+ 3
+ SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
+@@ -998,6 +1000,13 @@
+ mocs: SensorShellAgent.moc
+
+ #>+ 3
++StyleEngine.moc: $(srcdir)/StyleEngine.h
++ $(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
++
++#>+ 2
++mocs: StyleEngine.moc
++
++#>+ 3
+ HostConnector.moc: $(srcdir)/HostConnector.h
+ $(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
+
+@@ -1013,7 +1022,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
++ -rm -f TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am
+@@ -1064,7 +1073,7 @@
+
+
+ #>+ 11
+-libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
++libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
+ @echo 'creating libksgrd_la.all_cc.cc ...'; \
+ rm -f libksgrd_la.all_cc.files libksgrd_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
--- ksysguard/gui/Makefile.in
+++ ksysguard/gui/Makefile.in
@@ -212,6 +212,7 @@
@@ -106284,6 +111581,74 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -951,18 +960,18 @@
+
+
+ #>+ 3
+-ListViewSettings.moc: $(srcdir)/ListViewSettings.h
+- $(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
++SensorDisplay.moc: $(srcdir)/SensorDisplay.h
++ $(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
+
+ #>+ 2
+-mocs: ListViewSettings.moc
++mocs: SensorDisplay.moc
+
+ #>+ 3
+-SensorDisplay.moc: $(srcdir)/SensorDisplay.h
+- $(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
++ListViewSettings.moc: $(srcdir)/ListViewSettings.h
++ $(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
+
+ #>+ 2
+-mocs: SensorDisplay.moc
++mocs: ListViewSettings.moc
+
+ #>+ 3
+ DummyDisplay.moc: $(srcdir)/DummyDisplay.h
+@@ -1014,18 +1023,18 @@
+ mocs: ListView.moc
+
+ #>+ 3
+-ReniceDlg.moc: $(srcdir)/ReniceDlg.h
+- $(MOC) $(srcdir)/ReniceDlg.h -o ReniceDlg.moc
++SensorLogger.moc: $(srcdir)/SensorLogger.h
++ $(MOC) $(srcdir)/SensorLogger.h -o SensorLogger.moc
+
+ #>+ 2
+-mocs: ReniceDlg.moc
++mocs: SensorLogger.moc
+
+ #>+ 3
+-SensorLogger.moc: $(srcdir)/SensorLogger.h
+- $(MOC) $(srcdir)/SensorLogger.h -o SensorLogger.moc
++ReniceDlg.moc: $(srcdir)/ReniceDlg.h
++ $(MOC) $(srcdir)/ReniceDlg.h -o ReniceDlg.moc
+
+ #>+ 2
+-mocs: SensorLogger.moc
++mocs: ReniceDlg.moc
+
+ #>+ 3
+ DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
+@@ -1085,7 +1094,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++ -rm -f SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
+
+ #>+ 2
+ KDE_DIST=SignalPlotter.h LogFile.h SensorLoggerSettings.h SensorLoggerSettingsWidget.ui FancyPlotter.h SensorLoggerDlgWidget.ui.h Makefile.in DancingBarsSettings.h BarGraph.h MultiMeterSettingsWidget.ui MultiMeter.h ListViewSettingsWidget.ui.h ProcessList.h SensorDisplay.h SensorLoggerSettingsWidget.ui.h DummyDisplay.h ReniceDlg.h DancingBars.h MultiMeterSettings.h SensorLoggerDlgWidget.ui ListView.h ListViewSettingsWidget.ui SensorLoggerDlg.h FancyPlotterSettings.h SensorLogger.h MultiMeterSettingsWidget.ui.h ProcessController.h ListViewSettings.h Makefile.am LogFileSettings.ui
+@@ -1145,7 +1154,7 @@
+
+
+ #>+ 11
+-libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
+ @echo 'creating libsensordisplays_la.all_cc.cc ...'; \
+ rm -f libsensordisplays_la.all_cc.files libsensordisplays_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
--- ksysguard/ksysguardd/FreeBSD/Makefile.in
+++ ksysguard/ksysguardd/FreeBSD/Makefile.in
@@ -139,6 +139,7 @@
@@ -107229,6 +112594,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -900,23 +909,23 @@
+
+ #>+ 19
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
+
+ #>+ 15
+ force-reedit:
--- ksysguard/pics/Makefile.in
+++ ksysguard/pics/Makefile.in
@@ -117,6 +117,7 @@
@@ -107544,6 +112942,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -1087,29 +1096,29 @@
+
+ #>+ 25
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
+
+ #>+ 15
+ force-reedit:
--- ktip/pics/Makefile.in
+++ ktip/pics/Makefile.in
@@ -117,6 +117,7 @@
@@ -110589,6 +116026,146 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1335,64 +1344,64 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
+
+ #>+ 3
+-workspace.moc: $(srcdir)/workspace.h
+- $(MOC) $(srcdir)/workspace.h -o workspace.moc
++client.moc: $(srcdir)/client.h
++ $(MOC) $(srcdir)/client.h -o client.moc
+
+ #>+ 2
+-mocs: workspace.moc
++mocs: client.moc
+
+ #>+ 3
+-utils.moc: $(srcdir)/utils.h
+- $(MOC) $(srcdir)/utils.h -o utils.moc
++workspace.moc: $(srcdir)/workspace.h
++ $(MOC) $(srcdir)/workspace.h -o workspace.moc
+
+ #>+ 2
+-mocs: utils.moc
++mocs: workspace.moc
+
+ #>+ 3
+-main.moc: $(srcdir)/main.h
+- $(MOC) $(srcdir)/main.h -o main.moc
++tabbox.moc: $(srcdir)/tabbox.h
++ $(MOC) $(srcdir)/tabbox.h -o tabbox.moc
+
+ #>+ 2
+-mocs: main.moc
++mocs: tabbox.moc
+
+ #>+ 3
+-sm.moc: $(srcdir)/sm.h
+- $(MOC) $(srcdir)/sm.h -o sm.moc
++utils.moc: $(srcdir)/utils.h
++ $(MOC) $(srcdir)/utils.h -o utils.moc
+
+ #>+ 2
+-mocs: sm.moc
++mocs: utils.moc
+
+ #>+ 3
+-client.moc: $(srcdir)/client.h
+- $(MOC) $(srcdir)/client.h -o client.moc
++popupinfo.moc: $(srcdir)/popupinfo.h
++ $(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
+
+ #>+ 2
+-mocs: client.moc
++mocs: popupinfo.moc
+
+ #>+ 3
+-tabbox.moc: $(srcdir)/tabbox.h
+- $(MOC) $(srcdir)/tabbox.h -o tabbox.moc
++geometrytip.moc: $(srcdir)/geometrytip.h
++ $(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
+
+ #>+ 2
+-mocs: tabbox.moc
++mocs: geometrytip.moc
+
+ #>+ 3
+-popupinfo.moc: $(srcdir)/popupinfo.h
+- $(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
++main.moc: $(srcdir)/main.h
++ $(MOC) $(srcdir)/main.h -o main.moc
+
+ #>+ 2
+-mocs: popupinfo.moc
++mocs: main.moc
+
+ #>+ 3
+-geometrytip.moc: $(srcdir)/geometrytip.h
+- $(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
++sm.moc: $(srcdir)/sm.h
++ $(MOC) $(srcdir)/sm.h -o sm.moc
+
+ #>+ 2
+-mocs: geometrytip.moc
++mocs: sm.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
++ -rm -f client.moc workspace.moc tabbox.moc utils.moc popupinfo.moc geometrytip.moc main.moc sm.moc
+
+ #>+ 2
+ KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png HACKING COMPLIANCE sm.h CONFIGURING group.h notifications.h Makefile.am tabbox.h
+@@ -1407,17 +1416,17 @@
+
+ #>+ 13
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+
+ #>+ 15
+ force-reedit:
+@@ -1458,7 +1467,7 @@
+
+
+ #>+ 11
+-libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp client.moc workspace.moc tabbox.moc popupinfo.moc utils.moc geometrytip.moc sm.moc main.moc
++libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp workspace.moc utils.moc sm.moc main.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
+ @echo 'creating libkdeinit_kwin_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_kwin_la.all_cpp.files libkdeinit_kwin_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_kwin_la.all_cpp.final; \
+@@ -1511,13 +1520,13 @@
+ tabbox.lo: tabbox.moc
+ main.lo: main.moc
+ geometrytip.o: geometrytip.moc
+-client.lo: client.moc
+ utils.lo: utils.moc
++client.lo: client.moc
++main.o: main.moc
++utils.o: utils.moc
+ libkdeinit_kwin.la: $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkdeinit_kwin_la_LDFLAGS) $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_LIBADD) $(LIBS)
+
+-utils.o: utils.moc
+-main.o: main.moc
+ client.o: client.moc
+ nmcheck:
+ geometrytip.lo: geometrytip.moc
--- kwin/oldheaders/Makefile.in
+++ kwin/oldheaders/Makefile.in
@@ -120,6 +120,7 @@
@@ -110799,6 +116376,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -757,7 +766,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=menu.png greenie.light.png Makefile.in unknown.png pinup.png greenie.dim.png bluesun.png fog.png maximize.png maximizedown.png fog-grey.png pindown.png iconify.png Makefile.am close.png
++KDE_DIST=menu.png greenie.light.png Makefile.in unknown.png pinup.png greenie.dim.png bluesun.png fog.png maximize.png maximizedown.png pindown.png fog-grey.png iconify.png Makefile.am close.png
+
+ #>+ 2
+ docs-am:
--- kwin/tools/decobenchmark/Makefile.in
+++ kwin/tools/decobenchmark/Makefile.in
@@ -141,6 +141,7 @@
@@ -111219,6 +116805,25 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -734,15 +743,15 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+
+ #>+ 15
+ force-reedit:
--- l10n/Makefile.in
+++ l10n/Makefile.in
@@ -118,6 +118,7 @@
@@ -111324,6 +116929,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -774,7 +783,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=caribbean.desktop eastasia.desktop country.template easteurope.desktop southasia.desktop southeurope.desktop Makefile.in westafrica.desktop northeurope.desktop centralamerica.desktop westeurope.desktop middleeast.desktop northafrica.desktop southamerica.desktop oceania.desktop southeastasia.desktop centraleurope.desktop centralasia.desktop centralafrica.desktop southafrica.desktop northamerica.desktop Makefile.am
++KDE_DIST=caribbean.desktop eastasia.desktop country.template southasia.desktop easteurope.desktop southeurope.desktop Makefile.in westafrica.desktop northeurope.desktop centralamerica.desktop westeurope.desktop middleeast.desktop northafrica.desktop southamerica.desktop oceania.desktop southeastasia.desktop centraleurope.desktop centralasia.desktop centralafrica.desktop southafrica.desktop northamerica.desktop Makefile.am
+
+ #>+ 2
+ docs-am:
--- libkonq/favicons/Makefile.in
+++ libkonq/favicons/Makefile.in
@@ -158,6 +158,7 @@
@@ -111534,6 +117148,59 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -1361,18 +1370,18 @@
+ mocs: knewmenu.moc
+
+ #>+ 3
+-konq_operations.moc: $(srcdir)/konq_operations.h
+- $(MOC) $(srcdir)/konq_operations.h -o konq_operations.moc
++kivdirectoryoverlay.moc: $(srcdir)/kivdirectoryoverlay.h
++ $(MOC) $(srcdir)/kivdirectoryoverlay.h -o kivdirectoryoverlay.moc
+
+ #>+ 2
+-mocs: konq_operations.moc
++mocs: kivdirectoryoverlay.moc
+
+ #>+ 3
+-kivdirectoryoverlay.moc: $(srcdir)/kivdirectoryoverlay.h
+- $(MOC) $(srcdir)/kivdirectoryoverlay.h -o kivdirectoryoverlay.moc
++konq_operations.moc: $(srcdir)/konq_operations.h
++ $(MOC) $(srcdir)/konq_operations.h -o konq_operations.moc
+
+ #>+ 2
+-mocs: kivdirectoryoverlay.moc
++mocs: konq_operations.moc
+
+ #>+ 3
+ konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
+@@ -1427,7 +1436,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
++ -rm -f konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
+
+ #>+ 2
+ KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am
+@@ -1485,7 +1494,7 @@
+
+
+ #>+ 11
+-libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
++libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
+ @echo 'creating libkonq_la.all_cc.cc ...'; \
+ rm -f libkonq_la.all_cc.files libkonq_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkonq_la.all_cc.final; \
+@@ -1526,8 +1535,8 @@
+ konq_bgnddlg.o: konq_bgnddlg.moc
+ konq_bgnddlg.lo: konq_bgnddlg.moc
+ konq_faviconmgr.lo: konq_faviconmgr.moc
+-kivdirectoryoverlay.o: kivdirectoryoverlay.moc
+ konq_operations.o: konq_operations.moc
++kivdirectoryoverlay.o: kivdirectoryoverlay.moc
+ konq_filetip.lo: konq_filetip.moc
+ konq_drag.lo: konq_drag.moc
+ konq_popupmenu.o: konq_popupmenu.moc
--- libkonq/pics/Makefile.in
+++ libkonq/pics/Makefile.in
@@ -117,6 +117,7 @@
@@ -111865,8 +117532,8 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=startkde Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in
-+KDE_DIST=stamp-h.in startkde Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in
+-KDE_DIST=startkde Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in
++KDE_DIST=startkde stamp-h.in Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am Makefile.am.in kdebase.lsm
#>+ 2
docs-am:
@@ -112395,6 +118062,1601 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -725,842 +734,836 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr48-app-kbinaryclock.png cr32-app-mozilla.png cr64-app-licq.png cr32-app-xmag.png cr16-app-applixware.png cr48-app-xv.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-linuxconf.png cr48-app-package_settings.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-realplayer.png cr16-app-package_edutainment.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-mathematica.png cr32-app-gnumeric.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png crsc-app-systemtray.svgz cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr32-app-edu_science.png cr16-app-package_wordprocessing.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr64-app-phppg.png cr32-app-blender.png cr16-app-sodipodi.png cr32-app-xedit.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr16-app-licq.png cr128-app-pysol.png cr32-app-package_multimedia.png cr16-app-kvirc.png cr16-app-netscape.png cr128-app-linuxconf.png Makefile.in cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr22-app-fifteenpieces.png cr128-app-package_network.png cr32-app-pybliographic.png cr32-app-pinguin.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-mathematica.png cr16-app-pybliographic.png cr16-app-clanbomber.png cr64-app-kfm_home.png cr22-app-package_development.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png cr64-app-package.png crsc-app-quicktime.svgz cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-package_games.png cr32-app-wine.png cr64-app-wp.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr32-app-package_games_board.png crsc-app-fifteenpieces.svgz cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr64-app-taskbar.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-taskbar.png cr32-app-x.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr48-app-xemacs.png cr48-app-package.png cr64-app-gimp.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-systemtray.png cr48-app-package_games_strategy.png cr64-app-randr.png crsc-app-my_mac.svgz cr32-app-xeyes.png cr32-app-acroread.png cr16-app-evolution.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr128-app-applixware.png cr48-app-planner.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr32-app-xfig.png cr16-app-gvim.png cr16-app-linuxconf.png cr16-app-wabi.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png cr32-app-package_edutainment.png crsc-app-x.svgz cr48-app-randr.png crsc-app-camera.svgz cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr16-app-xv.png cr32-app-gabber.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr16-app-package_development.png cr64-app-xmag.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.png cr32-app-xclock.png cr22-app-taskbar.png cr32-app-wabi.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr22-app-runprocesscatcher.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr48-app-nedit.png cr128-app-penguin.png cr16-app-gaim.png cr128-app-xmag.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-abiword.png cr32-app-xemacs.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr32-app-alevt.png cr64-app-mozilla.png cr16-app-xmms.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr16-app-planner.png cr32-app-nedit.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png cr64-app-qtella.png crsc-app-package_development.svgz crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr16-app-kbinaryclock.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr48-app-package_games_card.png cr64-app-netscape.png crsc-app-kbinaryclock.svgz cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png
++KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-gaim.png cr48-app-xedit.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr48-app-kbinaryclock.png cr64-app-licq.png cr48-app-xv.png cr16-app-applixware.png cr32-app-xmag.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr48-app-linuxconf.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-gnumeric.png cr32-app-mathematica.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png crsc-app-systemtray.svgz cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr32-app-xedit.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr128-app-pysol.png cr16-app-licq.png crsc-app-aktion.svgz cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr22-app-fifteenpieces.png cr32-app-pybliographic.png cr32-app-pinguin.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png crsc-app-terminal.svgz cr64-app-kfm_home.png cr32-app-xapp.png cr48-app-licq.png cr48-app-xfmail.png cr64-app-applixware.png cr16-app-package_applications.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png crsc-app-quicktime.svgz cr64-app-package.png cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr64-app-wp.png cr32-app-package_games.png cr32-app-wine.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png crsc-app-fifteenpieces.svgz cr32-app-package_games_board.png cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr64-app-taskbar.png cr32-app-terminal.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr32-app-package_games_arcade.png cr48-app-mozilla.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.png cr32-app-taskbar.png cr16-app-mozilla.png cr48-app-kfm_home.png cr32-app-clanbomber.png crsc-app-xclock.svgz cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr64-app-gimp.png cr48-app-pan.png cr48-app-xemacs.png cr48-app-package.png cr48-app-pysol.png cr16-app-blender.png cr48-app-designer.png cr48-app-systemtray.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr32-app-acroread.png cr16-app-evolution.png cr32-app-xeyes.png crsc-app-shell.svgz cr16-app-acroread.png cr48-app-xchat.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-gv.png cr32-app-package_games_strategy.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr16-app-gnomemeeting.png cr16-app-xv.png cr32-app-gabber.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr48-app-kvirc.png cr128-app-mozilla.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-kfm_home.png cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr32-app-wabi.png cr22-app-taskbar.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr22-app-runprocesscatcher.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr16-app-gaim.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr48-app-package_development.png cr32-app-xmms.png cr48-app-package_toys.png crsc-app-wine.svgz cr32-app-xemacs.png cr32-app-abiword.png cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr16-app-xmms.png cr64-app-mozilla.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png cr48-app-tux.png crsc-app-error.svgz cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png crsc-app-package_development.svgz cr64-app-qtella.png crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr16-app-kbinaryclock.png cr64-app-acroread.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-galeon.png cr16-app-edu_miscellaneous.png cr48-app-dia.png cr16-app-linguist.png cr32-app-plan.png cr128-app-package_settings.png cr48-app-package_editors.png cr128-app-package.png cr48-app-phppg.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr48-app-package_games_card.png cr128-app-xclock.png crsc-app-kbinaryclock.svgz cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png
+
+ #>+ 2
+ docs-am:
+
+-#>+ 831
++#>+ 825
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++ $(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
+- $(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++ $(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+- $(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
+- $(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
++ $(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+ $(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+ $(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
++ $(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
+ $(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
+- $(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
+ $(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+ $(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++ $(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++ $(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
++ $(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
++ $(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
++ $(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++ $(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
++ $(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+ $(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+- $(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+- $(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
+- $(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
+- $(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
+- $(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
+- $(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
+- $(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+- $(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++ $(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
++ $(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++ $(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
++ $(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
+
+ #>+ 15
+ force-reedit:
--- pics/Makefile.in
+++ pics/Makefile.in
@@ -123,6 +123,7 @@
More information about the pkg-kde-commits
mailing list